Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit c25cb045ba94 · 2020-05-21T00:10:46.000+02:00
* 3.4:
  [PhpUnitBridge] fix installing on PHP 8 (ter)
  [PhpUnitBridge] fix installing on PHP 8 (bis)
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -197,8 +197,10 @@
         $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
-    if (preg_match('{\^(\d++\.\d++)[\d\.]*)$}', $info['requires']['php'], $phpVersion)) {
+    if (preg_match('{\^(\d++\.\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[1], PHP_VERSION, '<')) {
         $passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
+    } else {
+        $passthruOrFail("$COMPOSER config --unset platform.php");
     }
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");

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