Merge branch '3.4' into 4.3

* 3.4:
  [PhpUnitBridge] fix compat with older versions of composer
This commit is contained in:
Nicolas Grekas 2020-01-09 14:38:14 +01:00
commit 68b96fa024
1 changed files with 1 additions and 3 deletions

View File

@ -134,9 +134,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
$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)));