Skip to content

Commit 4af1b7a

Browse files
Merge branch '6.3' into 6.4
* 6.3: [FrameworkBundle] Fixed parsing new JSON output of debug:config not possible [DependencyInjection] Skip errored definitions deep-referenced as runtime exceptions [AssetMapper] Allow DirectoryResource for cache [PhpUnitBridge] Require PHPUnit 9.6 by default [WebProfilerBundle] Fix the accessibility of some background color [HttpKernel] Nullable and default value arguments in RequestPayloadValueResolver [WebProfilerBundle] right blocks: fix display [Messenger] Preserve existing Doctrine schema [Serializer] Refactor tests to not extends ObjectNormalizer [HttpFoundation] Make Request::getPayload() return an empty InputBag if request body is empty [HttpClient] Explicitly exclude CURLOPT_POSTREDIR [FrameworkBundle] Fix setting decorated services during tests
2 parents 8498ea1 + 0b0bf59 commit 4af1b7a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

bin/simple-phpunit.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@
9898
};
9999

100100
if (\PHP_VERSION_ID >= 80000) {
101-
// PHP 8 requires PHPUnit 9.3+, PHP 8.1 requires PHPUnit 9.5+
102-
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.5') ?: '9.5';
101+
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.6') ?: '9.6';
103102
} elseif (\PHP_VERSION_ID >= 70200) {
104-
// PHPUnit 8 requires PHP 7.2+
105103
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '8.5') ?: '8.5';
106104
} else {
107105
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '7.5') ?: '7.5';

0 commit comments

Comments
 (0)