From 606715b6eca987cfe8d0e3a8be6571e637f0c4ef Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 20 May 2020 23:49:59 +0200 Subject: [PATCH] [PhpUnitBridge] fix installing on PHP 8 --- src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit index 64966bb61a..bf4fbb0c28 100755 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit @@ -121,10 +121,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__ $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)));