bug #39331 [PhpUnitBridge] Fixed PHPunit 9.5 compatibility (wouterj)

fabpot · fabpot · commit 935495868a3b · 2020-12-05T16:57:56.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] Fixed PHPunit 9.5 compatibility | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39329 | License | MIT | Doc PR | - Let's see if this works 🍀 #SymfonyHackday Commits ------- 5134de5 Added compatibility with PHPunit 9.5
diff --git a/phpunit b/phpunit
@@ -13,7 +13,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
     } elseif (\PHP_VERSION_ID < 70300) {
         putenv('SYMFONY_PHPUNIT_VERSION=8.5');
     } else {
-        putenv('SYMFONY_PHPUNIT_VERSION=9.4');
+        putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
 if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
@@ -42,7 +42,7 @@ public function startTest($test)
             return;
         }
 
-        $annotations = $test->getAnnotations();
+        $annotations = Test::parseTestMethodAnnotations(\get_class($test), $test->getName(false));
 
         $ignoredAnnotations = ['covers', 'coversDefaultClass', 'coversNothing'];
 
diff --git a/src/Symfony/Component/Security/phpunit.xml.dist b/src/Symfony/Component/Security/phpunit.xml.dist
@@ -14,7 +14,6 @@
 
     <testsuites>
         <testsuite name="Symfony Security Component Test Suite">
-            <directory>./Tests/</directory>
             <directory>./*/Tests/</directory>
         </testsuite>
     </testsuites>
@@ -23,8 +22,6 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
                 <directory>./vendor</directory>
                 <directory>./*/Resources</directory>
                 <directory>./*/Tests</directory>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`13`	`13`	`} elseif (\PHP_VERSION_ID < 70300) {`
`14`	`14`	`putenv('SYMFONY_PHPUNIT_VERSION=8.5');`
`15`	`15`	`} else {`
`16`		`- putenv('SYMFONY_PHPUNIT_VERSION=9.4');`
	`16`	`+ putenv('SYMFONY_PHPUNIT_VERSION=9.5');`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function startTest($test)`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`
`45`		`- $annotations = $test->getAnnotations();`
	`45`	`+ $annotations = Test::parseTestMethodAnnotations(\get_class($test), $test->getName(false));`
`46`	`46`
`47`	`47`	`$ignoredAnnotations = ['covers', 'coversDefaultClass', 'coversNothing'];`
`48`	`48`