Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 68b96fa02463 · 2020-01-09T14:38:14.000+01:00
* 3.4:
  [PhpUnitBridge] fix compat with older versions of composer
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -134,9 +134,7 @@
         $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
-    if (PHP_VERSION_ID >= 70000) {
-        $passthruOrFail("$COMPOSER config --unset platform");
-    }
+    $passthruOrFail("$COMPOSER config --unset platform.php");
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));
