Merge branch '5.0'
* 5.0: [PhpUnitBridge] fix compat with older versions of composer
This commit is contained in:
commit
5c37ab016c
@ -141,9 +141,7 @@ if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") || $configurationH
|
||||
$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)));
|
||||
|
@ -18,7 +18,7 @@
|
||||
"require": {
|
||||
"php": "^7.2.5",
|
||||
"symfony/config": "^4.4|^5.0",
|
||||
"symfony/framework-bundle": "^4.4|^5.0",
|
||||
"symfony/framework-bundle": "^5.1",
|
||||
"symfony/http-kernel": "^4.4|^5.0",
|
||||
"symfony/routing": "^4.4|^5.0",
|
||||
"symfony/twig-bundle": "^4.4|^5.0",
|
||||
@ -28,7 +28,6 @@
|
||||
"symfony/browser-kit": "^4.4|^5.0",
|
||||
"symfony/console": "^4.4|^5.0",
|
||||
"symfony/css-selector": "^4.4|^5.0",
|
||||
"symfony/dependency-injection": "^4.4|^5.0",
|
||||
"symfony/stopwatch": "^4.4|^5.0"
|
||||
},
|
||||
"conflict": {
|
||||
|
Reference in New Issue
Block a user