Merge pull request #191 from owncloud/phpunit-8

Implement phpunit v8
owncloud · Apr 27, 2020 · a29683a · a29683a
2 parents f3e4586 + 0860e68
commit a29683a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/tests/unit/Command/FixEncryptedVersionTest.php b/tests/unit/Command/FixEncryptedVersionTest.php
@@ -128,12 +128,12 @@ public function testEncryptedVersionIsNotZero() {
 
 		$output = $this->commandTester->getDisplay();
 
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
 Attempting to fix the path: /test_enc_version_affected_user1/files/hello.txt
 Increment the encrypted version to 1
 The file /test_enc_version_affected_user1/files/hello.txt is: OK
 Fixed the file: /test_enc_version_affected_user1/files/hello.txt with version 1", $output);
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
 The file /test_enc_version_affected_user1/files/world.txt is: OK", $output);
 		/**
 		 * We need to add ob_start at the end because if not done, it would be considered as a risky test.
@@ -190,9 +190,9 @@ public function testEncryptedVersionLessThanOriginalValue() {
 
 		$output = $this->commandTester->getDisplay();
 
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/foo.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/foo.txt
 The file /test_enc_version_affected_user1/files/foo.txt is: OK", $output);
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
 Attempting to fix the path: /test_enc_version_affected_user1/files/hello.txt
 Decrement the encrypted version to 1
 Increment the encrypted version to 3
@@ -201,7 +201,7 @@ public function testEncryptedVersionLessThanOriginalValue() {
 Increment the encrypted version to 6
 The file /test_enc_version_affected_user1/files/hello.txt is: OK
 Fixed the file: /test_enc_version_affected_user1/files/hello.txt with version 6", $output);
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
 Attempting to fix the path: /test_enc_version_affected_user1/files/world.txt
 Increment the encrypted version to 2
 Increment the encrypted version to 3
@@ -262,9 +262,9 @@ public function testEncryptedVersionGreaterThanOriginalValue() {
 
 		$output = $this->commandTester->getDisplay();
 
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/foo.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/foo.txt
 The file /test_enc_version_affected_user1/files/foo.txt is: OK", $output);
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/hello.txt
 Attempting to fix the path: /test_enc_version_affected_user1/files/hello.txt
 Decrement the encrypted version to 14
 Decrement the encrypted version to 13
@@ -274,7 +274,7 @@ public function testEncryptedVersionGreaterThanOriginalValue() {
 Decrement the encrypted version to 9
 The file /test_enc_version_affected_user1/files/hello.txt is: OK
 Fixed the file: /test_enc_version_affected_user1/files/hello.txt with version 9", $output);
-		$this->assertContains("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
+		$this->assertStringContainsString("Verifying the content of file /test_enc_version_affected_user1/files/world.txt
 Attempting to fix the path: /test_enc_version_affected_user1/files/world.txt
 Decrement the encrypted version to 14
 Decrement the encrypted version to 13

diff --git a/tests/unit/Panels/AdminTest.php b/tests/unit/Panels/AdminTest.php
@@ -76,6 +76,6 @@ public function testGetPriority() {
 
 	public function testGetPanel() {
 		$templateHtml = $this->panel->getPanel()->fetchPage();
-		$this->assertContains('<form id="ocDefaultEncryptionModule" class="sub-section">', $templateHtml);
+		$this->assertStringContainsString('<form id="ocDefaultEncryptionModule" class="sub-section">', $templateHtml);
 	}
 }
diff --git a/tests/unit/Panels/PersonalTest.php b/tests/unit/Panels/PersonalTest.php
@@ -85,6 +85,6 @@ public function testGetPanel() {
 		$mockUser->expects($this->once())->method('getUID')->willReturn('testUser');
 		$this->userSession->expects($this->once())->method('getUser')->willReturn($mockUser);
 		$templateHtml = $this->panel->getPanel()->fetchPage();
-		$this->assertContains('<form id="ocDefaultEncryptionModule" class="section">', $templateHtml);
+		$this->assertStringContainsString('<form id="ocDefaultEncryptionModule" class="section">', $templateHtml);
 	}
 }
diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json
@@ -1,7 +1,7 @@
 {
     "config" : {
         "platform": {
-            "php": "7.1.3"
+            "php": "7.2"
         }
     },
     "require": {
@@ -16,6 +16,6 @@
         "symfony/translation": "^4.4",
         "sabre/xml": "^2.2",
         "guzzlehttp/guzzle": "^6.5",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.5"
     }
 }