Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 2b82fda37927 · 2019-08-01T16:31:46.000+02:00
* 3.4:
  Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -116,6 +116,8 @@
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
+
+    passthru("$COMPOSER config --unset platform");
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
         passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@`
`116`	`116`	`if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {`
`117`	`117`	`passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+ passthru("$COMPOSER config --unset platform");`
`119`	`121`	`if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {`
`120`	`122`	`passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");`
`121`	`123`	`passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));`