8000 Merge branch '3.4' into 4.3 · symfony/symfony@c3c233c · GitHub
[go: up one dir, main page]

Skip to content

Commit c3c233c

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
2 parents 8ea304d + b5df881 commit c3c233c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@
116116
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
117117
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
118118
}
119+
120+
passthru("$COMPOSER config --unset platform");
119121
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
120122
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
121123
passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

0 commit comments

Comments
 (0)
0