Merge pull request #37307 from owncloud/dependabot/composer/phpunit/p…

…hpunit-8.5.4

[Tests-Only] Bump phpunit/phpunit from 7.5.20 to 8.5.4

.gitignore

@@ -122,6 +122,7 @@ vendor-bin/**/composer.lock
 
 # Tests - auto-generated files
 /data-autotest
+/tests/.phpunit.result.cache
 /tests/coverage*
 /tests/karma-coverage
 /tests/autoconfig*

apps/files_external/tests/Command/ListCommandTest.php

@@ -162,7 +162,7 @@ public function testShortView($options, $expectedResult, $mountOptions) {
 			for ($i = 0; $i < $countResults; $i++) {
 				$this->assertEquals($expectedResult[$i]['mount_id'], $results[$i]['mount_id']);
 				$this->assertEquals($expectedResult[$i]['mount_point'], $results[$i]['mount_point']);
-				$this->assertContains($results[$i]['auth'], 'UserSession', true);
+				$this->assertStringContainsString($results[$i]['auth'], 'UserSession', true);
 				$this->assertEquals($expectedResult[$i]['type'], $results[$i]['type']);
 			}
 		} else {

apps/files_external/tests/Panels/AdminTest.php

@@ -72,6 +72,6 @@ public function testGetPanel() {
 		$this->backendService->expects($this->once())->method('getBackends')->willReturn([]);
 		$this->backendService->expects($this->once())->method('getAvailableBackends')->willReturn([]);
 		$templateHtml = $this->panel->getPanel()->fetchPage();
-		$this->assertContains('<h2 class="app-name">External Storage</h2>', $templateHtml);
+		$this->assertStringContainsString('<h2 class="app-name">External Storage</h2>', $templateHtml);
 	}
 }

apps/files_external/tests/Panels/PersonalTest.php

@@ -72,6 +72,6 @@ public function testGetPanel() {
 		$this->backendService->expects($this->once())->method('getBackends')->willReturn([]);
 		$this->backendService->expects($this->once())->method('getAvailableBackends')->willReturn([]);
 		$templateHtml = $this->panel->getPanel()->fetchPage();
-		$this->assertContains('<h2 class="app-name">External Storage</h2>', $templateHtml);
+		$this->assertStringContainsString('<h2 class="app-name">External Storage</h2>', $templateHtml);
 	}
 }

apps/files_trashbin/tests/ExpirationTest.php

@@ -138,9 +138,16 @@ public function testParseRetentionObligation($configValue, $expectedMinAge, $exp
 		);
 
 		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
-		$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
-		$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
-		$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
+		$expirationInternals = (array) $expiration;
+		$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0minAge";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedMinAge, $expirationInternals[$expectedKey]);
+		$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0maxAge";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedMaxAge, $expirationInternals[$expectedKey]);
+		$expectedKey = "\0OCA\\Files_Trashbin\\Expiration\0canPurgeToSaveSpace";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedCanPurgeToSaveSpace, $expirationInternals[$expectedKey]);
 	}
 
 	public function timestampTestData() {

apps/files_versions/tests/ExpirationTest.php

@@ -140,9 +140,16 @@ public function testParseRetentionObligation($configValue, $expectedMinAge, $exp
 		);
 
 		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
-		$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
-		$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
-		$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
+		$expirationInternals = (array) $expiration;
+		$expectedKey = "\0OCA\\Files_Versions\\Expiration\0minAge";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedMinAge, $expirationInternals[$expectedKey]);
+		$expectedKey = "\0OCA\\Files_Versions\\Expiration\0maxAge";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedMaxAge, $expirationInternals[$expectedKey]);
+		$expectedKey = "\0OCA\\Files_Versions\\Expiration\0canPurgeToSaveSpace";
+		$this->assertArrayHasKey($expectedKey, $expirationInternals);
+		$this->assertEquals($expectedCanPurgeToSaveSpace, $expirationInternals[$expectedKey]);
 	}
 
 	/**

composer.json

@@ -26,7 +26,7 @@
         "bamarni/composer-bin-plugin": "^1.4",
         "jakub-onderka/php-console-highlighter": "^0.4",
         "mikey179/vfsstream": "^1.6",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.5",
         "roave/security-advisories": "dev-master"
     },
     "require": {