Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).

derrabus · derrabus · commit ff47516ea079 · 2020-09-14T08:11:19.000+02:00
diff --git a/phpunit b/phpunit
@@ -12,10 +12,10 @@ 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');
         }
-        if (\PHP_VERSION_ID >= 80000) {
-            putenv('SYMFONY_PHPUNIT_VERSION=9.3');
+        if (\PHP_VERSION_ID < 70300) {
+            putenv('SYMFONY_PHPUNIT_VERSION=8.5');
         } else {
-            putenv('SYMFONY_PHPUNIT_VERSION=8.3');
+            putenv('SYMFONY_PHPUNIT_VERSION=9.3');
         }
     } elseif (\PHP_VERSION_ID >= 70000) {
         putenv('SYMFONY_PHPUNIT_VERSION=6.5');
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -49,8 +49,8 @@ public function __construct(array $mockedNamespaces = array())
             \PHPUnit_Util_Blacklist::$blacklistedClassNames[__CLASS__] = 2;
         } elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
             eval(" // PHP 5.3 compat
-            (new BlackList())->getBlacklistedDirectories();
-            Blacklist::addDirectory(\dirname((new \ReflectionClass(__CLASS__))->getFileName(), 2));
+            (new \PHPUnit\Util\Blacklist())->getBlacklistedDirectories();
+            \PHPUnit\Util\Blacklist::addDirectory(\dirname(__FILE__, 2));
             ");
         } else {
             Blacklist::$blacklistedClassNames[__CLASS__] = 2;
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -25,7 +25,7 @@
         "symfony/debug": "~2.8|~3.0|~4.0",
         "symfony/event-dispatcher": "~3.4|~4.0",
         "symfony/http-foundation": "^3.4.38|^4.3",
-        "symfony/http-kernel": "^3.4.31|^4.3.4",
+        "symfony/http-kernel": "^3.4.44|^4.3.4",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -26,7 +26,7 @@
     },
     "require-dev": {
         "doctrine/collections": "~1.0",
-        "symfony/validator": "^3.4.3|^4.0.3",
+        "symfony/validator": "^3.4.44|^4.0.3",
         "symfony/dependency-injection": "~3.3|~4.0",
         "symfony/config": "~2.7|~3.0|~4.0",
         "symfony/expression-language": "~3.4|~4.0",

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ 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`		`- if (\PHP_VERSION_ID >= 80000) {`
`16`		`- putenv('SYMFONY_PHPUNIT_VERSION=9.3');`
	`15`	`+ if (\PHP_VERSION_ID < 70300) {`
	`16`	`+ putenv('SYMFONY_PHPUNIT_VERSION=8.5');`
`17`	`17`	`} else {`
`18`		`- putenv('SYMFONY_PHPUNIT_VERSION=8.3');`
	`18`	`+ putenv('SYMFONY_PHPUNIT_VERSION=9.3');`
`19`	`19`	`}`
`20`	`20`	`} elseif (\PHP_VERSION_ID >= 70000) {`
`21`	`21`	`putenv('SYMFONY_PHPUNIT_VERSION=6.5');`