Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit d8a026bcadb4 · 2019-09-28T18:12:55.000+02:00
* 3.4:
  sync phpunit script with master
diff --git a/phpunit b/phpunit
@@ -9,10 +9,16 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
 }
 if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
     if (\PHP_VERSION_ID >= 70200) {
+        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');
     } elseif (\PHP_VERSION_ID >= 70000) {
         putenv('SYMFONY_PHPUNIT_VERSION=6.5');
     }
 }
+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
+    putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
+}
 putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
 require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,16 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {`
`9`	`9`	`}`
`10`	`10`	`if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`11`	`11`	`if (\PHP_VERSION_ID >= 70200) {`
	`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`	`+ putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');`
	`14`	`+ }`
`12`	`15`	`putenv('SYMFONY_PHPUNIT_VERSION=8.3');`
`13`	`16`	`} elseif (\PHP_VERSION_ID >= 70000) {`
`14`	`17`	`putenv('SYMFONY_PHPUNIT_VERSION=6.5');`
`15`	`18`	`}`
`16`	`19`	`}`
	`20`	`+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {`
	`21`	`+ putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');`
	`22`	`+}`
`17`	`23`	`putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');`
`18`	`24`	`require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';`