Merge branch '3.3' into 3.4

* 3.3:
  Fix phpunit bridge (bis)
This commit is contained in:
Nicolas Grekas 2017-10-13 18:49:51 +02:00
commit 0454396746

View File

@ -70,7 +70,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
}
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
if ($exit) {