DeprecatedCastRule: Utilize Scope::getPhpVersion() (#6600)

Author: staabm

src/Php/PhpVersions.php

@@ -183,6 +183,11 @@ public function supportsVoidCast(): TrinaryLogic
 		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;
 	}
 
+	public function deprecatesNonStandardCasts(): TrinaryLogic
+	{
+		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;
+	}
+
 	public function supportsDeprecatedTraits(): TrinaryLogic
 	{
 		return IntegerRangeType::fromInterval(80500, null)->isSuperTypeOf($this->phpVersions)->result;

src/Rules/Cast/DeprecatedCastRule.php

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

tests/PHPStan/Rules/Cast/DeprecatedCastRuleTest.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\Cast;
 
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use const PHP_VERSION_ID;
@@ -15,7 +14,7 @@ class DeprecatedCastRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new DeprecatedCastRule(new PhpVersion(PHP_VERSION_ID));
+		return new DeprecatedCastRule();
 	}
 
 	public function testRule(): void
@@ -45,4 +44,22 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/deprecated-cast.php'], $errors);
 	}
 
+	public function testConditionallyExecutedCode(): void
+	{
+		$errors = [
+			[
+				'Non-standard (integer) cast is deprecated in PHP 8.5. Use (int) instead.',
+				8,
+			],
+		];
+		if (PHP_VERSION_ID >= 80500) {
+			$errors[] = [
+				'Non-standard (integer) cast is deprecated in PHP 8.5. Use (int) instead.',
+				15,
+			];
+		}
+
+		$this->analyse([__DIR__ . '/data/deprecated-cast-php-versions.php'], $errors);
+	}
+
 }

tests/PHPStan/Rules/Cast/data/deprecated-cast-php-versions.php

@@ -0,0 +1,16 @@
+<?php // lint >= 8.5
+
+namespace DeprecatedCastPhpVersions;
+
+function doFoo($value): void
+{
+	if (PHP_VERSION_ID >= 80500) {
+		(integer) $value;
+	}
+
+	if (PHP_VERSION_ID < 80500) {
+		(integer) $value;
+	}
+
+	(integer) $value;
+}