Allow 8.5 as PHP version no. 2

.github/workflows/lint.yml

@@ -28,6 +28,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout"

.github/workflows/reflection-golden-test.yml

@@ -67,6 +67,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - uses: Wandalen/wretry.action@v3.8.0

.github/workflows/static-analysis.yml

@@ -34,6 +34,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         operating-system: [ubuntu-latest, windows-latest]
 
     steps:
@@ -80,6 +81,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout"

.github/workflows/tests.yml

@@ -35,6 +35,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         operating-system: [ ubuntu-latest, windows-latest ]
 
     steps:

conf/config.neon

@@ -7,7 +7,7 @@ parameters:
 	bootstrapFiles:
 		- ../stubs/runtime/ReflectionUnionType.php
 		- ../stubs/runtime/ReflectionAttribute.php
-		- ../stubs/runtime/Attribute.php
+		- ../stubs/runtime/Attribute85.php
 		- ../stubs/runtime/ReflectionIntersectionType.php
 	excludePaths: []
 	level: null

conf/parametersSchema.neon

@@ -87,10 +87,10 @@ parametersSchema:
 		buffer: int()
 	])
 	phpVersion: schema(anyOf(
-		schema(int(), min(70100), max(80499)),
+		schema(int(), min(70100), max(80599)),
 		structure([
-			min: schema(int(), min(70100), max(80499)),
-			max: schema(int(), min(70100), max(80499))
+			min: schema(int(), min(70100), max(80599)),
+			max: schema(int(), min(70100), max(80599))
 		])
 	), nullable())
 	polluteScopeWithLoopInitialAssignments: bool()

e2e/composer-min-open-end-version/test.php

@@ -1,6 +1,6 @@
 <?php
 
-\PHPStan\Testing\assertType('int<80100, 80499>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<80100, 80599>', PHP_VERSION_ID);
 \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION);
-\PHPStan\Testing\assertType('int<1, 4>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION);
 \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);

e2e/composer-min-version/test.php

@@ -1,6 +1,6 @@
 <?php
 
-\PHPStan\Testing\assertType('int<80100, 80499>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<80100, 80599>', PHP_VERSION_ID);
 \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION);
-\PHPStan\Testing\assertType('int<1, 4>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION);
 \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);

e2e/composer-no-versions/test.php

@@ -1,6 +1,6 @@
 <?php
 
-\PHPStan\Testing\assertType('int<50207, 80499>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<50207, 80599>', 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);

src/Php/PhpVersionFactory.php

@@ -13,7 +13,7 @@ final class PhpVersionFactory
 {
 
 	public const MIN_PHP_VERSION = 70100;
-	public const MAX_PHP_VERSION = 80499;
+	public const MAX_PHP_VERSION = 80599;
 	public const MAX_PHP5_VERSION = 50699;
 	public const MAX_PHP7_VERSION = 70499;
 

src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php

@@ -31,6 +31,7 @@
 use function extension_loaded;
 use function is_dir;
 use function is_file;
+use const PHP_VERSION_ID;
 
 #[AutowiredService]
 final class BetterReflectionSourceLocatorFactory
@@ -75,7 +76,13 @@ public function __construct(
 
 	public function create(): SourceLocator
 	{
-		$locators = [];
+		$locators = [
+			$this->optimizedSingleFileSourceLocatorRepository->getOrCreate(
+				PHP_VERSION_ID < 80500
+					? __DIR__ . '/../../../stubs/runtime/Attribute84.php'
+					: __DIR__ . '/../../../stubs/runtime/Attribute85.php',
+			),
+		];
 
 		if ($this->singleReflectionFile !== null) {
 			$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($this->singleReflectionFile);

src/Testing/TestCaseSourceLocatorFactory.php

@@ -16,12 +16,14 @@
 use PHPStan\Reflection\BetterReflection\SourceLocator\AutoloadSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\ComposerJsonAndInstalledJsonSourceLocatorMaker;
 use PHPStan\Reflection\BetterReflection\SourceLocator\FileNodesFetcher;
+use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
 use PHPStan\Reflection\BetterReflection\SourceLocator\PhpVersionBlacklistSourceLocator;
 use ReflectionClass;
 use function dirname;
 use function is_file;
 use function serialize;
 use function sha1;
+use const PHP_VERSION_ID;
 
 final class TestCaseSourceLocatorFactory
 {
@@ -35,6 +37,7 @@ final class TestCaseSourceLocatorFactory
 	 */
 	public function __construct(
 		private ComposerJsonAndInstalledJsonSourceLocatorMaker $composerJsonAndInstalledJsonSourceLocatorMaker,
+		private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,
 		private Parser $phpParser,
 		private Parser $php8Parser,
 		private FileNodesFetcher $fileNodesFetcher,
@@ -57,7 +60,13 @@ public function create(): SourceLocator
 			$this->excludePaths,
 		]));
 		if ($classLoaderReflection->hasProperty('vendorDir') && ! isset(self::$composerSourceLocatorsCache[$cacheKey])) {
-			$composerLocators = [];
+			$composerLocators = [
+				$this->optimizedSingleFileSourceLocatorRepository->getOrCreate(
+					PHP_VERSION_ID < 80500
+						? __DIR__ . '/../../stubs/runtime/Attribute84.php'
+						: __DIR__ . '/../../stubs/runtime/Attribute85.php',
+				),
+			];
 			$vendorDirProperty = $classLoaderReflection->getProperty('vendorDir');
 			$vendorDirProperty->setAccessible(true);
 			foreach ($classLoaders as $classLoader) {

stubs/runtime/Attribute85.php

@@ -0,0 +1,88 @@
+<?php
+
+if (\PHP_VERSION_ID < 80000 && !class_exists('Attribute', false)) {
+	#[Attribute(Attribute::TARGET_CLASS)]
+	class Attribute
+	{
+
+		/** @var int */
+		public $flags;
+
+		/**
+		 * Marks that attribute declaration is allowed only in classes.
+		 */
+		const TARGET_CLASS = 1;
+
+		/**
+		 * Marks that attribute declaration is allowed only in functions.
+		 */
+		const TARGET_FUNCTION = 1 << 1;
+
+		/**
+		 * Marks that attribute declaration is allowed only in class methods.
+		 */
+		const TARGET_METHOD = 1 << 2;
+
+		/**
+		 * Marks that attribute declaration is allowed only in class properties.
+		 */
+		const TARGET_PROPERTY = 1 << 3;
+
+		/**
+		 * Marks that attribute declaration is allowed only in class constants.
+		 */
+		const TARGET_CLASS_CONSTANT = 1 << 4;
+
+		/**
+		 * Marks that attribute declaration is allowed only in function or method parameters.
+		 */
+		const TARGET_PARAMETER = 1 << 5;
+
+		/**
+		 * Marks that attribute declaration is allowed only in global constants with "const" keyword.
+		 */
+		const TARGET_CONSTANT = 1 << 6;
+
+		/**
+		 * Marks that attribute declaration is allowed anywhere.
+		 */
+		const TARGET_ALL = (1 << 7) - 1;
+
+		/**
+		 * Notes that an attribute declaration in the same place is
+		 * allowed multiple times.
+		 */
+		const IS_REPEATABLE = 1 << 7;
+
+		/**
+		 * @param int $flags A value in the form of a bitmask indicating the places
+		 * where attributes can be defined.
+		 */
+		public function __construct($flags = self::TARGET_ALL)
+		{
+			$this->flags = $flags;
+		}
+
+	}
+}
+
+if (\PHP_VERSION_ID < 80100 && !class_exists('ReturnTypeWillChange', false)) {
+	#[Attribute(Attribute::TARGET_METHOD)]
+	final class ReturnTypeWillChange
+	{
+	}
+}
+
+if (\PHP_VERSION_ID < 80200 && !class_exists('AllowDynamicProperties', false)) {
+	#[Attribute(Attribute::TARGET_CLASS)]
+	final class AllowDynamicProperties
+	{
+	}
+}
+
+if (\PHP_VERSION_ID < 80200 && !class_exists('SensitiveParameter', false)) {
+	#[Attribute(Attribute::TARGET_PARAMETER)]
+	final class SensitiveParameter
+	{
+	}
+}

tests/PHPStan/Analyser/ScopePhpVersionTest.php

@@ -15,11 +15,11 @@ public static function dataTestPhpVersion(): array
 	{
 		return [
 			[
-				'int<80000, 80499>',
+				'int<80000, 80599>',
 				__DIR__ . '/data/scope-constants-global.php',
 			],
 			[
-				'int<80000, 80499>',
+				'int<80000, 80599>',
 				__DIR__ . '/data/scope-constants-namespace.php',
 			],
 		];

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, 80499>', PHP_VERSION_ID);
+assertType('int<50207, 80599>', PHP_VERSION_ID);
 assertType('string', PHP_EXTRA_VERSION);
 assertType('0|1', PHP_ZTS);
 assertType('0|1', PHP_DEBUG);

tests/PHPStan/Command/CommandHelperTest.php

@@ -165,7 +165,7 @@ public static function dataParameters(): array
 					'bootstrapFiles' => [
 						realpath(__DIR__ . '/../../../stubs/runtime/ReflectionUnionType.php'),
 						realpath(__DIR__ . '/../../../stubs/runtime/ReflectionAttribute.php'),
-						realpath(__DIR__ . '/../../../stubs/runtime/Attribute.php'),
+						realpath(__DIR__ . '/../../../stubs/runtime/Attribute85.php'),
 						realpath(__DIR__ . '/../../../stubs/runtime/ReflectionIntersectionType.php'),
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'here.php',
 					],

tests/PHPStan/Php/PhpVersionFactoryTest.php

@@ -81,15 +81,21 @@ public static function dataCreate(): array
 			[
 				null,
 				'8.5',
-				80499,
-				'8.4.99',
+				80500,
+				'8.5',
 			],
 			[
 				null,
 				'8.0.95',
 				80095,
 				'8.0.95',
 			],
+			[
+				null,
+				'8.6',
+				80599,
+				'8.5.99',
+			],
 		];
 	}