Fixes

DanielEScherzer · DanielEScherzer · commit 02e8c5fe6cb1 · 2025-09-15T12:42:15.000-07:00
Case insensitive attribute handling, mandatory parameter, enum cases
diff --git a/src/Reflection/Native/NativeFunctionReflection.php b/src/Reflection/Native/NativeFunctionReflection.php
@@ -10,6 +10,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Type;
 use function count;
+use function strtolower;
 
 final class NativeFunctionReflection implements FunctionReflection
 {
@@ -153,7 +154,7 @@ public function getAttributes(): array
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
 		foreach ($this->attributes as $attrib) {
-			if ($attrib->getName() === 'NoDiscard') {
+			if (strtolower($attrib->getName()) === 'nodiscard') {
 				return TrinaryLogic::createYes();
 			}
 		}
diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -230,7 +230,7 @@ public function getAttributes(): array
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
 		foreach ($this->attributes as $attrib) {
-			if ($attrib->getName() === 'NoDiscard') {
+			if (strtolower($attrib->getName()) === 'nodiscard') {
 				return TrinaryLogic::createYes();
 			}
 		}
diff --git a/src/Reflection/Php/EnumCasesMethodReflection.php b/src/Reflection/Php/EnumCasesMethodReflection.php
@@ -163,7 +163,7 @@ public function getAttributes(): array
 
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
-		return TrinaryLogic::createYes();
+		return TrinaryLogic::createNo();
 	}
 
 }
diff --git a/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php b/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php
@@ -24,6 +24,7 @@
 use function array_reverse;
 use function is_array;
 use function is_string;
+use function strtolower;
 
 /**
  * @api
@@ -333,7 +334,7 @@ public function getAttributes(): array
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
 		foreach ($this->attributes as $attrib) {
-			if ($attrib->getName() === 'NoDiscard') {
+			if (strtolower($attrib->getName()) === 'nodiscard') {
 				return TrinaryLogic::createYes();
 			}
 		}
diff --git a/src/Reflection/Php/PhpFunctionReflection.php b/src/Reflection/Php/PhpFunctionReflection.php
@@ -29,6 +29,7 @@
 use function count;
 use function is_array;
 use function is_file;
+use function strtolower;
 
 #[GenerateFactory(interface: FunctionReflectionFactory::class)]
 final class PhpFunctionReflection implements FunctionReflection
@@ -278,7 +279,7 @@ public function getAttributes(): array
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
 		foreach ($this->attributes as $attrib) {
-			if ($attrib->getName() === 'NoDiscard') {
+			if (strtolower($attrib->getName()) === 'nodiscard') {
 				return TrinaryLogic::createYes();
 			}
 		}
diff --git a/src/Reflection/Php/PhpMethodReflection.php b/src/Reflection/Php/PhpMethodReflection.php
@@ -523,7 +523,7 @@ public function getAttributes(): array
 	public function hasNoDiscardAttribute(): TrinaryLogic
 	{
 		foreach ($this->attributes as $attrib) {
-			if ($attrib->getName() === 'NoDiscard') {
+			if (strtolower($attrib->getName()) === 'nodiscard') {
 				return TrinaryLogic::createYes();
 			}
 		}
diff --git a/src/Rules/AttributesCheck.php b/src/Rules/AttributesCheck.php
@@ -40,7 +40,7 @@ public function check(
 		array $attrGroups,
 		int $requiredTarget,
 		string $targetName,
-		bool $isPropertyHook = false,
+		bool $isPropertyHook,
 	): array
 	{
 		$errors = [];
diff --git a/src/Rules/Classes/ClassAttributesRule.php b/src/Rules/Classes/ClassAttributesRule.php
@@ -38,6 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 			$classLikeNode->attrGroups,
 			Attribute::TARGET_CLASS,
 			'class',
+			false,
 		);
 
 		$classReflection = $node->getClassReflection();
diff --git a/src/Rules/Classes/ClassConstantAttributesRule.php b/src/Rules/Classes/ClassConstantAttributesRule.php
@@ -32,6 +32,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->attrGroups,
 			Attribute::TARGET_CLASS_CONSTANT,
 			'class constant',
+			false,
 		);
 	}
 
diff --git a/src/Rules/EnumCases/EnumCaseAttributesRule.php b/src/Rules/EnumCases/EnumCaseAttributesRule.php
@@ -32,6 +32,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->attrGroups,
 			Attribute::TARGET_CLASS_CONSTANT,
 			'class constant',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Functions/ArrowFunctionAttributesRule.php b/src/Rules/Functions/ArrowFunctionAttributesRule.php
@@ -33,6 +33,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Functions/ClosureAttributesRule.php b/src/Rules/Functions/ClosureAttributesRule.php
@@ -33,6 +33,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Functions/FunctionAttributesRule.php b/src/Rules/Functions/FunctionAttributesRule.php
@@ -33,6 +33,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Functions/ParamAttributesRule.php b/src/Rules/Functions/ParamAttributesRule.php
@@ -39,6 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->attrGroups,
 			$targetType,
 			$targetName,
+			false,
 		);
 	}
 
diff --git a/src/Rules/Methods/MethodAttributesRule.php b/src/Rules/Methods/MethodAttributesRule.php
@@ -33,6 +33,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_METHOD,
 			'method',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Properties/PropertyAttributesRule.php b/src/Rules/Properties/PropertyAttributesRule.php
@@ -32,6 +32,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->attrGroups,
 			Attribute::TARGET_PROPERTY,
 			'property',
+			false,
 		);
 	}
 
diff --git a/src/Rules/Traits/TraitAttributesRule.php b/src/Rules/Traits/TraitAttributesRule.php
@@ -38,6 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 			$originalNode->attrGroups,
 			Attribute::TARGET_CLASS,
 			'class',
+			false,
 		);
 
 		if (count($node->getTraitReflection()->getNativeReflection()->getAttributes('AllowDynamicProperties')) > 0) {
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionStatementWithNoDiscardRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionStatementWithNoDiscardRuleTest.php
@@ -23,6 +23,10 @@ public function testRule(): void
 				'Call to function FunctionCallStatementResultDiscarded\withSideEffects() on a separate line discards return value.',
 				11,
 			],
+			[
+				'Call to function FunctionCallStatementResultDiscarded\differentCase() on a separate line discards return value.',
+				25,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/Functions/data/function-call-statement-result-discarded.php b/tests/PHPStan/Rules/Functions/data/function-call-statement-result-discarded.php
@@ -15,3 +15,11 @@ function withSideEffects(): array {
 foreach (withSideEffects() as $num) {
 	var_dump($num);
 }
+
+#[\nOdISCArD]
+function differentCase(): array {
+	echo __FUNCTION__ . "\n";
+	return [1];
+}
+
+differentCase();
diff --git a/tests/PHPStan/Rules/Methods/CallToMethodStatementWithNoDiscardRuleTest.php b/tests/PHPStan/Rules/Methods/CallToMethodStatementWithNoDiscardRuleTest.php
@@ -22,11 +22,15 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/method-call-statement-result-discarded.php'], [
 			[
 				'Call to method MethodCallStatementResultDiscarded\ClassWithInstanceSideEffects::instanceMethod() on a separate line discards return value.',
-				14,
+				20,
 			],
 			[
 				'Call to method MethodCallStatementResultDiscarded\ClassWithInstanceSideEffects::instanceMethod() on a separate line discards return value.',
-				15,
+				21,
+			],
+			[
+				'Call to method MethodCallStatementResultDiscarded\ClassWithInstanceSideEffects::differentCase() on a separate line discards return value.',
+				30,
 			],
 		]);
 	}
diff --git a/tests/PHPStan/Rules/Methods/CallToStaticMethodStatementWithNoDiscardRuleTest.php b/tests/PHPStan/Rules/Methods/CallToStaticMethodStatementWithNoDiscardRuleTest.php
@@ -26,7 +26,11 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/static-method-call-statement-result-discarded.php'], [
 			[
 				'Call to static method MethodCallStatementResultDiscarded\ClassWithStaticSideEffects::staticMethod() on a separate line discards return value.',
-				13,
+				19,
+			],
+			[
+				'Call to static method MethodCallStatementResultDiscarded\ClassWithStaticSideEffects::differentCase() on a separate line discards return value.',
+				27,
 			],
 		]);
 	}
diff --git a/tests/PHPStan/Rules/Methods/data/method-call-statement-result-discarded.php b/tests/PHPStan/Rules/Methods/data/method-call-statement-result-discarded.php
@@ -8,6 +8,12 @@ public function instanceMethod(): array {
 		echo __METHOD__ . "\n";
 		return [2];
 	}
+
+	#[\nOdISCArD]
+	public function differentCase(): array {
+		echo __METHOD__ . "\n";
+		return [2];
+	}
 }
 
 $o = new ClassWithInstanceSideEffects();
@@ -20,3 +26,5 @@ public function instanceMethod(): array {
 foreach ($o->instanceMethod() as $num) {
 	var_dump($num);
 }
+
+$o->differentCase();
diff --git a/tests/PHPStan/Rules/Methods/data/static-method-call-statement-result-discarded.php b/tests/PHPStan/Rules/Methods/data/static-method-call-statement-result-discarded.php
@@ -8,6 +8,12 @@ public static function staticMethod(): array {
 		echo __METHOD__ . "\n";
 		return [2];
 	}
+
+	#[\nOdISCArD]
+	public static function differentCase(): array {
+		echo __METHOD__ . "\n";
+		return [2];
+	}
 }
 
 ClassWithStaticSideEffects::staticMethod();
@@ -17,3 +23,5 @@ public static function staticMethod(): array {
 foreach (ClassWithStaticSideEffects::staticMethod() as $num) {
 	var_dump($num);
 }
+
+ClassWithStaticSideEffects::differentCase();

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use PHPStan\TrinaryLogic;`
`11`	`11`	`use PHPStan\Type\Type;`
`12`	`12`	`use function count;`
	`13`	`+use function strtolower;`
`13`	`14`
`14`	`15`	`final class NativeFunctionReflection implements FunctionReflection`
`15`	`16`	`{`
`@@ -153,7 +154,7 @@ public function getAttributes(): array`
`153`	`154`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`154`	`155`	`{`
`155`	`156`	`foreach ($this->attributes as $attrib) {`
`156`		`- if ($attrib->getName() === 'NoDiscard') {`
	`157`	`+ if (strtolower($attrib->getName()) === 'nodiscard') {`
`157`	`158`	`return TrinaryLogic::createYes();`
`158`	`159`	`}`
`159`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public function getAttributes(): array`
`230`	`230`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`231`	`231`	`{`
`232`	`232`	`foreach ($this->attributes as $attrib) {`
`233`		`- if ($attrib->getName() === 'NoDiscard') {`
	`233`	`+ if (strtolower($attrib->getName()) === 'nodiscard') {`
`234`	`234`	`return TrinaryLogic::createYes();`
`235`	`235`	`}`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public function getAttributes(): array`
`163`	`163`
`164`	`164`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`165`	`165`	`{`
`166`		`- return TrinaryLogic::createYes();`
	`166`	`+ return TrinaryLogic::createNo();`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`use function array_reverse;`
`25`	`25`	`use function is_array;`
`26`	`26`	`use function is_string;`
	`27`	`+use function strtolower;`
`27`	`28`
`28`	`29`	`/**`
`29`	`30`	`* @api`
`@@ -333,7 +334,7 @@ public function getAttributes(): array`
`333`	`334`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`334`	`335`	`{`
`335`	`336`	`foreach ($this->attributes as $attrib) {`
`336`		`- if ($attrib->getName() === 'NoDiscard') {`
	`337`	`+ if (strtolower($attrib->getName()) === 'nodiscard') {`
`337`	`338`	`return TrinaryLogic::createYes();`
`338`	`339`	`}`
`339`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`use function count;`
`30`	`30`	`use function is_array;`
`31`	`31`	`use function is_file;`
	`32`	`+use function strtolower;`
`32`	`33`
`33`	`34`	`#[GenerateFactory(interface: FunctionReflectionFactory::class)]`
`34`	`35`	`final class PhpFunctionReflection implements FunctionReflection`
`@@ -278,7 +279,7 @@ public function getAttributes(): array`
`278`	`279`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`279`	`280`	`{`
`280`	`281`	`foreach ($this->attributes as $attrib) {`
`281`		`- if ($attrib->getName() === 'NoDiscard') {`
	`282`	`+ if (strtolower($attrib->getName()) === 'nodiscard') {`
`282`	`283`	`return TrinaryLogic::createYes();`
`283`	`284`	`}`
`284`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ public function getAttributes(): array`
`523`	`523`	`public function hasNoDiscardAttribute(): TrinaryLogic`
`524`	`524`	`{`
`525`	`525`	`foreach ($this->attributes as $attrib) {`
`526`		`- if ($attrib->getName() === 'NoDiscard') {`
	`526`	`+ if (strtolower($attrib->getName()) === 'nodiscard') {`
`527`	`527`	`return TrinaryLogic::createYes();`
`528`	`528`	`}`
`529`	`529`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function check(`
`40`	`40`	`array $attrGroups,`
`41`	`41`	`int $requiredTarget,`
`42`	`42`	`string $targetName,`
`43`		`- bool $isPropertyHook = false,`
	`43`	`+ bool $isPropertyHook,`
`44`	`44`	`): array`
`45`	`45`	`{`
`46`	`46`	`$errors = [];`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public function processNode(Node $node, Scope $scope): array`
`32`	`32`	`$node->attrGroups,`
`33`	`33`	`Attribute::TARGET_CLASS_CONSTANT,`
`34`	`34`	`'class constant',`
	`35`	`+ false,`
`35`	`36`	`);`
`36`	`37`	`}`
`37`	`38`