Skip to content

Commit 227018a

Browse files
Merge branch '4.4' into 5.0
* 4.4: [PhpUnitBridge] fix compat with older versions of composer
2 parents 329e62b + 1460cb5 commit 227018a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

bin/simple-phpunit.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@
141141
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
142142
}
143143

144-
if (PHP_VERSION_ID >= 70000) {
145-
$passthruOrFail("$COMPOSER config --unset platform");
146-
}
144+
$passthruOrFail("$COMPOSER config --unset platform.php");
147145
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
148146
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
149147
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

0 commit comments

Comments
 (0)