Merge branch '3.4' into 4.4
* 3.4: [PhpUnitBridge] fix setting platform.php
This commit is contained in:
commit
47180fe447
@ -197,7 +197,7 @@ if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") || $configurationH
|
|||||||
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
|
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('{\^(\d++\.\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[1], PHP_VERSION, '<')) {
|
if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', PHP_VERSION, '<')) {
|
||||||
$passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
|
$passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
|
||||||
} else {
|
} else {
|
||||||
$passthruOrFail("$COMPOSER config --unset platform.php");
|
$passthruOrFail("$COMPOSER config --unset platform.php");
|
||||||
|
Reference in New Issue
Block a user