Resolve property, trait constant, arrow function never and attribute PHP version checks from Scope::getPhpVersion()

src/Php/PhpVersions.php

@@ -56,6 +56,51 @@ public function supportsNativeTypesInClassConstants(): TrinaryLogic
 		return IntegerRangeType::fromInterval(80300, null)->isSuperTypeOf($this->phpVersions)->result;
 	}
 
+	public function supportsConstantsInTraits(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80200, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsNeverReturnTypeInArrowFunction(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80200, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsArrayUnpackingWithStringKeys(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80100, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsPropertyHooks(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80400, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsFinalProperties(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80400, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsAsymmetricVisibilityForStaticProperties(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsOverrideAttributeOnProperty(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsAttributesOnGlobalConstants(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
+	public function supportsUnsetCast(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(null, 79999)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
 	public function supportsTrueAndFalseStandaloneType(): TrinaryLogic
 	{
 		return IntegerRangeType::fromInterval(80200, null)->isSuperTypeOf($this->phpVersions)->result;

src/Rules/Arrays/ArrayUnpackingRule.php

@@ -7,7 +7,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\Expr\NativeTypeExpr;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
@@ -23,7 +22,7 @@
 final class ArrayUnpackingRule implements Rule
 {
 
-	public function __construct(private PhpVersion $phpVersion, private RuleLevelHelper $ruleLevelHelper)
+	public function __construct(private RuleLevelHelper $ruleLevelHelper)
 	{
 	}
 
@@ -34,7 +33,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if ($node->unpack === false || $this->phpVersion->supportsArrayUnpackingWithStringKeys()) {
+		if ($node->unpack === false || $scope->getPhpVersion()->supportsArrayUnpackingWithStringKeys()->yes()) {
 			return [];
 		}
 

src/Rules/Cast/UnsetCastRule.php

@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 
@@ -16,18 +15,14 @@
 final class UnsetCastRule implements Rule
 {
 
-	public function __construct(private PhpVersion $phpVersion)
-	{
-	}
-
 	public function getNodeType(): string
 	{
 		return Node\Expr\Cast\Unset_::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if ($this->phpVersion->supportsUnsetCast()) {
+		if ($scope->getPhpVersion()->supportsUnsetCast()->yes()) {
 			return [];
 		}
 

src/Rules/Constants/ConstantAttributesRule.php

@@ -8,7 +8,6 @@
 use PHPStan\Analyser\NodeCallbackInvoker;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -23,7 +22,6 @@ final class ConstantAttributesRule implements Rule
 
 	public function __construct(
 		private AttributesCheck $attributesCheck,
-		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -39,7 +37,7 @@ public function processNode(Node $node, Scope&NodeCallbackInvoker&CollectedDataE
 			return [];
 		}
 
-		if (!$this->phpVersion->supportsAttributesOnGlobalConstants()) {
+		if (!$scope->getPhpVersion()->supportsAttributesOnGlobalConstants()->yes()) {
 			return [
 				RuleErrorBuilder::message('Attributes on global constants are supported only on PHP 8.5 and later.')
 					->identifier('constant.attributesNotSupported')

src/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRule.php

@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\FunctionDefinitionCheck;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -20,7 +19,7 @@
 final class ExistingClassesInArrowFunctionTypehintsRule implements Rule
 {
 
-	public function __construct(private FunctionDefinitionCheck $check, private PhpVersion $phpVersion)
+	public function __construct(private FunctionDefinitionCheck $check)
 	{
 	}
 
@@ -32,7 +31,7 @@ public function getNodeType(): string
 	public function processNode(Node $node, Scope $scope): array
 	{
 		$messages = [];
-		if ($node->returnType !== null && !$this->phpVersion->supportsNeverReturnTypeInArrowFunction()) {
+		if ($node->returnType !== null && !$scope->getPhpVersion()->supportsNeverReturnTypeInArrowFunction()->yes()) {
 			$returnType = ParserNodeTypeToPHPStanType::resolve($node->returnType, $scope->isInClass() ? $scope->getClassReflection() : null);
 			if ($returnType instanceof NonAcceptingNeverType) {
 				$messages[] = RuleErrorBuilder::message('Never return type in arrow function is supported only on PHP 8.2 and later.')

src/Rules/Properties/PropertiesInInterfaceRule.php

@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\ClassPropertyNode;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 
@@ -17,10 +16,6 @@
 final class PropertiesInInterfaceRule implements Rule
 {
 
-	public function __construct(private PhpVersion $phpVersion)
-	{
-	}
-
 	public function getNodeType(): string
 	{
 		return ClassPropertyNode::class;
@@ -32,7 +27,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$this->phpVersion->supportsPropertyHooks()) {
+		if (!$scope->getPhpVersion()->supportsPropertyHooks()->yes()) {
 			return [
 				RuleErrorBuilder::message('Interfaces can include properties only on PHP 8.4 and later.')
 					->nonIgnorable()

src/Rules/Properties/PropertyAttributesRule.php

@@ -9,7 +9,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\ClassPropertyNode;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -24,7 +23,6 @@ final class PropertyAttributesRule implements Rule
 
 	public function __construct(
 		private AttributesCheck $attributesCheck,
-		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -36,7 +34,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope&NodeCallbackInvoker&CollectedDataEmitter $scope): array
 	{
-		if (!$this->phpVersion->supportsOverrideAttributeOnProperty()) {
+		if (!$scope->getPhpVersion()->supportsOverrideAttributeOnProperty()->yes()) {
 			$propertyReflection = $node->getClassReflection()->getNativeProperty($node->getName());
 			if (count($propertyReflection->getNativeReflection()->getAttributes('Override')) > 0) {
 				return [

src/Rules/Properties/PropertyInClassRule.php

@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\ClassPropertyNode;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 
@@ -17,10 +16,6 @@
 final class PropertyInClassRule implements Rule
 {
 
-	public function __construct(private PhpVersion $phpVersion)
-	{
-	}
-
 	public function getNodeType(): string
 	{
 		return ClassPropertyNode::class;
@@ -36,7 +31,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		if (
 			$node->isFinal()
-			&& !$this->phpVersion->supportsFinalProperties()
+			&& !$scope->getPhpVersion()->supportsFinalProperties()->yes()
 		) {
 			return [
 				RuleErrorBuilder::message('Final properties are supported only on PHP 8.4 and later.')
@@ -164,7 +159,7 @@ public function processNode(Node $node, Scope $scope): array
 				];
 			}
 			if (
-				!$this->phpVersion->supportsAsymmetricVisibilityForStaticProperties()
+				!$scope->getPhpVersion()->supportsAsymmetricVisibilityForStaticProperties()->yes()
 				&& (
 					$node->isPrivateSet()
 					|| $node->isProtectedSet()
@@ -191,7 +186,7 @@ public function processNode(Node $node, Scope $scope): array
 			}
 		}
 
-		if (!$this->phpVersion->supportsPropertyHooks()) {
+		if (!$scope->getPhpVersion()->supportsPropertyHooks()->yes()) {
 			if ($node->hasHooks()) {
 				return [
 					RuleErrorBuilder::message('Property hooks are supported only on PHP 8.4 and later.')

src/Rules/Traits/ConstantsInTraitsRule.php

@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 
@@ -16,10 +15,6 @@
 final class ConstantsInTraitsRule implements Rule
 {
 
-	public function __construct(private PhpVersion $phpVersion)
-	{
-	}
-
 	public function getNodeType(): string
 	{
 		return Node\Stmt\ClassConst::class;
@@ -30,7 +25,7 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if ($this->phpVersion->supportsConstantsInTraits()) {
+		if ($scope->getPhpVersion()->supportsConstantsInTraits()->yes()) {
 			return [];
 		}
 

tests/PHPStan/Rules/Arrays/ArrayUnpackingRuleTest.php

@@ -2,12 +2,12 @@
 
 namespace PHPStan\Rules\Arrays;
 
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<ArrayUnpackingRule>
@@ -22,7 +22,6 @@ class ArrayUnpackingRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new ArrayUnpackingRule(
-			self::getContainer()->getByType(PhpVersion::class),
 			new RuleLevelHelper(
 				self::createReflectionProvider(),
 				checkNullables: true,
@@ -117,6 +116,26 @@ public function testRuleDoNotCheckUnions(): void
 		]);
 	}
 
+	public function testPhpVersionNarrowedScope(): void
+	{
+		$this->checkUnions = true;
+
+		$errors = [
+			[
+				'Array unpacking cannot be used on an array with string keys: array<string, string>',
+				11,
+			],
+		];
+		if (PHP_VERSION_ID < 80100) {
+			$errors[] = [
+				'Array unpacking cannot be used on an array with string keys: array<string, string>',
+				18,
+			];
+		}
+
+		$this->analyse([__DIR__ . '/data/array-unpacking-php-versions.php'], $errors);
+	}
+
 	public static function dataRuleOnPHP81(): array
 	{
 		return [

tests/PHPStan/Rules/Arrays/data/array-unpacking-php-versions.php

@@ -0,0 +1,19 @@
+<?php // lint >= 8.1
+
+namespace ArrayUnpackingPhpVersions;
+
+/**
+ * @param array<string, string> $a
+ */
+function doFoo(array $a): void
+{
+	if (PHP_VERSION_ID < 80100) {
+		$unsupportedInBranch = [...$a];
+	}
+
+	if (PHP_VERSION_ID >= 80100) {
+		$supportedInBranch = [...$a];
+	}
+
+	$always = [...$a];
+}

tests/PHPStan/Rules/Cast/UnsetCastRuleConfigPhpTest.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Cast;
+
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<UnsetCastRule>
+ */
+class UnsetCastRuleConfigPhpTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new UnsetCastRule();
+	}
+
+	public function testRulePhpVersionRangeSpanning80(): void
+	{
+		$this->analyse([__DIR__ . '/data/unset-cast-php-versions.php'], [
+			[
+				'The (unset) cast is no longer supported in PHP 8.0 and later.',
+				11,
+			],
+			[
+				'The (unset) cast is no longer supported in PHP 8.0 and later.',
+				14,
+			],
+		]);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/data/unset-cast-php-version.neon',
+		];
+	}
+
+}