bug #37771 Use PHPUnit 9.3 on php 8 (derrabus)

fabpot · fabpot · commit 78cc0ef62ae8 · 2020-08-12T13:46:11.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Use PHPUnit 9.3 on php 8 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Part of #37564 | License | MIT | Doc PR | N/A Our CI for PHP 8 is currently a blind spot, mainly because the PHPUnit version 8.3 that we use for the test suite is incompatible with php 8. This PR changes the PHPUnit version used on Travis for php 8 to PHPUnit 9.3. Our test suite might not be 100% compatible with that new PHPUnit release yet, but this change should allow us to run most tests on php 8 again and enable us to iteratively migrate to PHPUnit 9.3. Commits ------- d642d85 Use PHPUnit 9.3 on php 8.
diff --git a/phpunit b/phpunit
@@ -12,7 +12,11 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
             putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
         }
-        putenv('SYMFONY_PHPUNIT_VERSION=8.3');
+        if (\PHP_VERSION_ID >= 80000) {
+            putenv('SYMFONY_PHPUNIT_VERSION=9.3');
+        } else {
+            putenv('SYMFONY_PHPUNIT_VERSION=8.3');
+        }
     } elseif (\PHP_VERSION_ID >= 70000) {
         putenv('SYMFONY_PHPUNIT_VERSION=6.5');
     }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,11 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`12`	`12`	`if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {`
`13`	`13`	`putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');`
`14`	`14`	`}`
`15`		`- putenv('SYMFONY_PHPUNIT_VERSION=8.3');`
	`15`	`+ if (\PHP_VERSION_ID >= 80000) {`
	`16`	`+ putenv('SYMFONY_PHPUNIT_VERSION=9.3');`
	`17`	`+ } else {`
	`18`	`+ putenv('SYMFONY_PHPUNIT_VERSION=8.3');`
	`19`	`+ }`
`16`	`20`	`} elseif (\PHP_VERSION_ID >= 70000) {`
`17`	`21`	`putenv('SYMFONY_PHPUNIT_VERSION=6.5');`
`18`	`22`	`}`