Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 004bf7b78114 · 2020-05-21T20:35:07.000+02:00
* 3.4:
  [PhpUnitBridge] fix setting platform.php
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -197,7 +197,7 @@
         $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
-    if (preg_match('{\^(\d++\.\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[1], PHP_VERSION, '<')) {
+    if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', PHP_VERSION, '<')) {
         $passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");
     } else {
         $passthruOrFail("$COMPOSER config --unset platform.php");

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@`
`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) && version_compare($phpVersion[1], PHP_VERSION, '<')) {`
	`200`	`+ if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', PHP_VERSION, '<')) {`
`201`	`201`	`$passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");`
`202`	`202`	`} else {`
`203`	`203`	`$passthruOrFail("$COMPOSER config --unset platform.php");`