Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 18bf85759400 · 2020-05-20T23:50:56.000+02:00
* 3.4:
  [PhpUnitBridge] fix installing on PHP 8
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -197,10 +197,9 @@
         $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
-    if ($info['requires']['php'] !== $phpVersion = preg_replace('{\^([\d\.]++)$}', '>=$1', $info['requires']['php'])) {
-        $passthruOrFail("$COMPOSER require --no-update \"php:$phpVersion\"");
+    if (preg_match('{\^(\d++\.\d++)[\d\.]*)$}', $info['requires']['php'], $phpVersion)) {
+        $passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
     }
-    $passthruOrFail("$COMPOSER config --unset platform.php");
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

Original file line number	Diff line number	Diff line change
`@@ -197,10 +197,9 @@`
`197`	`197`	`$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`198`	`198`	`}`
`199`	`199`
`200`		`- if ($info['requires']['php'] !== $phpVersion = preg_replace('{\^([\d\.]++)$}', '>=$1', $info['requires']['php'])) {`
`201`		`- $passthruOrFail("$COMPOSER require --no-update \"php:$phpVersion\"");`
	`200`	`+ if (preg_match('{\^(\d++\.\d++)[\d\.]*)$}', $info['requires']['php'], $phpVersion)) {`
	`201`	`+ $passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");`
`202`	`202`	`}`
`203`		`- $passthruOrFail("$COMPOSER config --unset platform.php");`
`204`	`203`	`if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {`
`205`	`204`	`$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");`
`206`	`205`	`$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));`