From 00dff4b99c99abad686b98bf1791be650b7b3173 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sat, 27 Jun 2026 08:26:14 +0200 Subject: [PATCH] Allow PHP 8.6-nightly --- conf/parametersSchema.neon | 6 +++--- e2e/composer-min-open-end-version/test.php | 2 +- e2e/composer-min-version/test.php | 2 +- e2e/composer-no-versions/test.php | 2 +- src/Php/PhpVersionFactory.php | 2 +- tests/PHPStan/Analyser/Fiber/data/fnsr.php | 2 +- tests/PHPStan/Analyser/ScopePhpVersionTest.php | 4 ++-- tests/PHPStan/Analyser/nsrt/predefined-constants.php | 2 +- tests/PHPStan/Php/PhpVersionFactoryTest.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/parametersSchema.neon b/conf/parametersSchema.neon index 7d1ed9047b5..4aabd767e09 100644 --- a/conf/parametersSchema.neon +++ b/conf/parametersSchema.neon @@ -111,10 +111,10 @@ parametersSchema: loadLimit: schema(float(), nullable()) ]) phpVersion: schema(anyOf( - schema(int(), min(70100), max(80599)), + schema(int(), min(70100), max(80600)), structure([ - min: schema(int(), min(70100), max(80599)), - max: schema(int(), min(70100), max(80599)) + min: schema(int(), min(70100), max(80600)), + max: schema(int(), min(70100), max(80600)) ]) ), nullable()) polluteScopeWithLoopInitialAssignments: bool() diff --git a/e2e/composer-min-open-end-version/test.php b/e2e/composer-min-open-end-version/test.php index 9ed998185b8..d11d2fd64b8 100644 --- a/e2e/composer-min-open-end-version/test.php +++ b/e2e/composer-min-open-end-version/test.php @@ -1,6 +1,6 @@ ', PHP_VERSION_ID); +\PHPStan\Testing\assertType('int<80100, 80600>', PHP_VERSION_ID); \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION); \PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION); \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION); diff --git a/e2e/composer-min-version/test.php b/e2e/composer-min-version/test.php index 9ed998185b8..d11d2fd64b8 100644 --- a/e2e/composer-min-version/test.php +++ b/e2e/composer-min-version/test.php @@ -1,6 +1,6 @@ ', PHP_VERSION_ID); +\PHPStan\Testing\assertType('int<80100, 80600>', PHP_VERSION_ID); \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION); \PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION); \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION); diff --git a/e2e/composer-no-versions/test.php b/e2e/composer-no-versions/test.php index 3cae7a0628f..edfba982014 100644 --- a/e2e/composer-no-versions/test.php +++ b/e2e/composer-no-versions/test.php @@ -1,6 +1,6 @@ ', PHP_VERSION_ID); +\PHPStan\Testing\assertType('int<50207, 80600>', PHP_VERSION_ID); \PHPStan\Testing\assertType('int<5, 8>', PHP_MAJOR_VERSION); \PHPStan\Testing\assertType('int<0, max>', PHP_MINOR_VERSION); \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION); diff --git a/src/Php/PhpVersionFactory.php b/src/Php/PhpVersionFactory.php index 73f510e0dca..e221d47c28b 100644 --- a/src/Php/PhpVersionFactory.php +++ b/src/Php/PhpVersionFactory.php @@ -13,7 +13,7 @@ final class PhpVersionFactory { public const MIN_PHP_VERSION = 70100; - public const MAX_PHP_VERSION = 80599; + public const MAX_PHP_VERSION = 80600; public const MAX_PHP5_VERSION = 50699; public const MAX_PHP7_VERSION = 70499; diff --git a/tests/PHPStan/Analyser/Fiber/data/fnsr.php b/tests/PHPStan/Analyser/Fiber/data/fnsr.php index ccfeaa3e85a..c483e10aec7 100644 --- a/tests/PHPStan/Analyser/Fiber/data/fnsr.php +++ b/tests/PHPStan/Analyser/Fiber/data/fnsr.php @@ -479,7 +479,7 @@ function doFoo(): void { } function (): void { - assertType('int<50207, 80599>', PHP_VERSION_ID); + assertType('int<50207, 80600>', PHP_VERSION_ID); }; function (int $i) { diff --git a/tests/PHPStan/Analyser/ScopePhpVersionTest.php b/tests/PHPStan/Analyser/ScopePhpVersionTest.php index 193a55c53cf..e26b3fc9c11 100644 --- a/tests/PHPStan/Analyser/ScopePhpVersionTest.php +++ b/tests/PHPStan/Analyser/ScopePhpVersionTest.php @@ -15,11 +15,11 @@ public static function dataTestPhpVersion(): array { return [ [ - 'int<80000, 80599>', + 'int<80000, 80600>', __DIR__ . '/data/scope-constants-global.php', ], [ - 'int<80000, 80599>', + 'int<80000, 80600>', __DIR__ . '/data/scope-constants-namespace.php', ], ]; diff --git a/tests/PHPStan/Analyser/nsrt/predefined-constants.php b/tests/PHPStan/Analyser/nsrt/predefined-constants.php index 7c38d3833b5..757feab5e38 100644 --- a/tests/PHPStan/Analyser/nsrt/predefined-constants.php +++ b/tests/PHPStan/Analyser/nsrt/predefined-constants.php @@ -7,7 +7,7 @@ assertType('int<5, 8>', PHP_MAJOR_VERSION); assertType('int<0, max>', PHP_MINOR_VERSION); assertType('int<0, max>', PHP_RELEASE_VERSION); -assertType('int<50207, 80599>', PHP_VERSION_ID); +assertType('int<50207, 80600>', PHP_VERSION_ID); assertType('string', PHP_EXTRA_VERSION); assertType('0|1', PHP_ZTS); assertType('0|1', PHP_DEBUG); diff --git a/tests/PHPStan/Php/PhpVersionFactoryTest.php b/tests/PHPStan/Php/PhpVersionFactoryTest.php index 3687e60e075..46c1649f4ac 100644 --- a/tests/PHPStan/Php/PhpVersionFactoryTest.php +++ b/tests/PHPStan/Php/PhpVersionFactoryTest.php @@ -93,7 +93,7 @@ public static function dataCreate(): array [ null, '8.6', - 80599, + 80600, '8.5.99', ], ];