Skip to content

Commit 0d61f3a

Browse files
Merge branch '4.3' into 4.4
* 4.3: fix tests
2 parents b127715 + f62cb5f commit 0d61f3a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

bin/simple-phpunit.php

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

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

0 commit comments

Comments
 (0)