8000 bug #32868 [PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be i… · symfony/symfony@b5df881 · GitHub
[go: up one dir, main page]

Skip to content
8000

Commit b5df881

Browse files
bug #32868 [PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be installed with phpunit 4.8 (jderusse)
This PR was merged into the 3.4 branch. Discussion ---------- [PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be installed with phpunit 4.8 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | NA | License | MIT | Doc PR | NA phpunit/phpunit 4.8 defined the composer.json config.platform to php 5.3 which is not compatible with symfony/phpunit-bridge > 4.2 This PR removes the config from composer.json Commits ------- a0f68aa Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
2 parents 9f40b10 + a0f68aa commit b5df881

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
8383
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
8484
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
8585
}
86+
87+
passthru("$COMPOSER config --unset platform");
8688
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
8789
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
8890
passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

0 commit comments

Comments
 (0)
0