[PhpUnitBridge] fix setting platform.php

nicolas-grekas · nicolas-grekas · commit f926812c6b3d · 2020-05-21T20:33:26.000+02:00
diff --git a/bin/simple-phpunit b/bin/simple-phpunit
@@ -121,7 +121,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
         $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
`@@ -121,7 +121,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") \|\| md5_file(__`
`121`	`121`	`$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`122`	`122`	`}`
`123`	`123`
`124`		`- if (preg_match('{\^(\d++\.\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[1], PHP_VERSION, '<')) {`
	`124`	`+ if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', PHP_VERSION, '<')) {`
`125`	`125`	`$passthruOrFail("$COMPOSER config platform.php \"$phpVersion[1].99\"");`
`126`	`126`	`} else {`
`127`	`127`	`$passthruOrFail("$COMPOSER config --unset platform.php");`