Skip to content

Commit f62cb5f

Browse files
Merge branch '3.4' into 4.3
* 3.4: fix tests
2 parents 7c7daea + 4ec4a23 commit f62cb5f

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
@@ -134,7 +134,9 @@
134134
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
135135
}
136136

137-
$passthruOrFail("$COMPOSER config --unset platform");
137+
if (PHP_VERSION_ID >= 70000) {
138+
$passthruOrFail("$COMPOSER config --unset platform");
139+
}
138140
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
139141
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
140142
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

0 commit comments

Comments
 (0)