Remove the PHP version constraint from the #[\NoDiscard] attribute rules.

Author: claudepache

CLAUDE.md

@@ -282,7 +282,7 @@ Recent work on PHP 8.5 support shows the pattern:
 - **Parser support**: Update nikic/php-parser dependency, handle new AST node types
 - **NodeScopeResolver**: Handle new syntax (pipe operator, clone-with, void cast)
 - **Type system**: New type representations if needed
-- **Rules**: Version-gated rules (e.g. deprecated casts only reported on PHP 8.5+, `#[NoDiscard]` only on PHP 8.5+)
+- **Rules**: Version-gated rules (e.g. deprecated casts only reported on PHP 8.5+)
 - **InitializerExprTypeResolver**: Support new constant expression forms (casts, first-class callables, static closures in initializers)
 - **Reflection**: Support new attributes, property features (asymmetric visibility on static properties, `#[Override]` on properties)
 - **PhpVersion**: Add detection methods like `supportsPropertyHooks()`, `supportsPipeOperator()`, etc.

src/Rules/Functions/CallToFunctionStatementWithNoDiscardRule.php

@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -22,7 +21,6 @@ final class CallToFunctionStatementWithNoDiscardRule implements Rule
 
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
-		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -61,10 +59,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$this->phpVersion->supportsNoDiscardAttribute()) {
-			return [];
-		}
-
 		if ($funcCall->name instanceof Node\Name) {
 			if (!$this->reflectionProvider->hasFunction($funcCall->name, $scope)) {
 				return [];

src/Rules/Methods/CallToMethodStatementWithNoDiscardRule.php

@@ -6,7 +6,6 @@
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
@@ -23,7 +22,6 @@ final class CallToMethodStatementWithNoDiscardRule implements Rule
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
-		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -67,10 +65,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$this->phpVersion->supportsNoDiscardAttribute()) {
-			return [];
-		}
-
 		$methodName = $methodCall->name->toString();
 		$typeResult = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,

src/Rules/Methods/CallToStaticMethodStatementWithNoDiscardRule.php

@@ -6,7 +6,6 @@
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -26,7 +25,6 @@ final class CallToStaticMethodStatementWithNoDiscardRule implements Rule
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
 		private ReflectionProvider $reflectionProvider,
-		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -68,10 +66,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$this->phpVersion->supportsNoDiscardAttribute()) {
-			return [];
-		}
-
 		$methodName = $methodCall->name->toString();
 		if ($methodCall->class instanceof Node\Name) {
 			$className = $scope->resolveName($methodCall->class);

tests/PHPStan/Rules/Functions/CallToFunctionStatementWithNoDiscardRuleTest.php

@@ -2,11 +2,8 @@
 
 namespace PHPStan\Rules\Functions;
 
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use PHPUnit\Framework\Attributes\RequiresPhp;
-use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<CallToFunctionStatementWithNoDiscardRule>
@@ -16,10 +13,9 @@ class CallToFunctionStatementWithNoDiscardRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new CallToFunctionStatementWithNoDiscardRule(self::createReflectionProvider(), new PhpVersion(PHP_VERSION_ID));
+		return new CallToFunctionStatementWithNoDiscardRule(self::createReflectionProvider());
 	}
 
-	#[RequiresPhp('>= 8.5.0')]
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/function-call-statement-result-discarded.php'], [

tests/PHPStan/Rules/Methods/CallToMethodStatementWithNoDiscardRuleTest.php

@@ -2,12 +2,9 @@
 
 namespace PHPStan\Rules\Methods;
 
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
-use PHPUnit\Framework\Attributes\RequiresPhp;
-use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<CallToMethodStatementWithNoDiscardRule>
@@ -28,11 +25,9 @@ protected function getRule(): Rule
 				checkBenevolentUnionTypes: false,
 				discoveringSymbolsTip: true,
 			),
-			new PhpVersion(PHP_VERSION_ID),
 		);
 	}
 
-	#[RequiresPhp('>= 8.5.0')]
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/method-call-statement-result-discarded.php'], [

tests/PHPStan/Rules/Methods/CallToStaticMethodStatementWithNoDiscardRuleTest.php

@@ -2,12 +2,9 @@
 
 namespace PHPStan\Rules\Methods;
 
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
-use PHPUnit\Framework\Attributes\RequiresPhp;
-use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<CallToStaticMethodStatementWithNoDiscardRule>
@@ -30,11 +27,9 @@ protected function getRule(): Rule
 				discoveringSymbolsTip: true,
 			),
 			$reflectionProvider,
-			new PhpVersion(PHP_VERSION_ID),
 		);
 	}
 
-	#[RequiresPhp('>= 8.5.0')]
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/static-method-call-statement-result-discarded.php'], [