Merge branch '3.4' into 4.4

* 3.4: [PhpUnitBridge] fix setting platform.php
wouterj · May 21, 2020 · 47180fe · 47180fe
2 parents 0349890 + dd902d9
commit 47180fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/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");