Rework property hook check

ondrejmirtes · ondrejmirtes · commit 6adb1cde5574 · 2025-09-18T08:58:11.000+02:00
diff --git a/src/Rules/AttributesCheck.php b/src/Rules/AttributesCheck.php
@@ -40,7 +40,6 @@ public function check(
 		array $attrGroups,
 		int $requiredTarget,
 		string $targetName,
-		bool $isPropertyHook,
 	): array
 	{
 		$errors = [];
@@ -82,12 +81,6 @@ public function check(
 						->identifier('attribute.target')
 						->line($attribute->getStartLine())
 						->build();
-				} elseif ($isPropertyHook && strtolower($name) === 'nodiscard') {
-					// #[\NoDiscard] cannot be used on property hooks
-					$errors[] = RuleErrorBuilder::message(sprintf('Attribute class %s cannot be used on property hooks.', $name))
-						->identifier('attribute.target')
-						->line($attribute->getStartLine())
-						->build();
 				}
 
 				if (($flags & Attribute::IS_REPEATABLE) === 0) {
diff --git a/src/Rules/Classes/ClassAttributesRule.php b/src/Rules/Classes/ClassAttributesRule.php
@@ -38,7 +38,6 @@ 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,7 +32,6 @@ 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,7 +32,6 @@ 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,7 +33,6 @@ 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,7 +33,6 @@ 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,7 +33,6 @@ 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,7 +39,6 @@ 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,7 +33,6 @@ 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,7 +32,6 @@ public function processNode(Node $node, Scope $scope): array
 			$node->attrGroups,
 			Attribute::TARGET_PROPERTY,
 			'property',
-			false,
 		);
 	}
 
diff --git a/src/Rules/Properties/PropertyHookAttributesRule.php b/src/Rules/Properties/PropertyHookAttributesRule.php
@@ -9,6 +9,9 @@
 use PHPStan\Node\InPropertyHookNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use function sprintf;
+use function strtolower;
 
 /**
  * @implements Rule<InPropertyHookNode>
@@ -28,13 +31,29 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		return $this->attributesCheck->check(
+		$attrGroups = $node->getOriginalNode()->attrGroups;
+		$errors = $this->attributesCheck->check(
 			$scope,
-			$node->getOriginalNode()->attrGroups,
+			$attrGroups,
 			Attribute::TARGET_METHOD,
 			'method',
-			true,
 		);
+
+		foreach ($attrGroups as $attrGroup) {
+			foreach ($attrGroup->attrs as $attribute) {
+				$name = $attribute->name->toString();
+				if (strtolower($name) === 'nodiscard') {
+					$errors[] = RuleErrorBuilder::message(sprintf('Attribute class %s cannot be used on property hooks.', $name))
+						->identifier('attribute.target')
+						->line($attribute->getStartLine())
+						->nonIgnorable()
+						->build();
+					break;
+				}
+			}
+		}
+
+		return $errors;
 	}
 
 }
diff --git a/src/Rules/Traits/TraitAttributesRule.php b/src/Rules/Traits/TraitAttributesRule.php
@@ -38,7 +38,6 @@ public function processNode(Node $node, Scope $scope): array
 			$originalNode->attrGroups,
 			Attribute::TARGET_CLASS,
 			'class',
-			false,
 		);
 
 		if (count($node->getTraitReflection()->getNativeReflection()->getAttributes('AllowDynamicProperties')) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public function processNode(Node $node, Scope $scope): array`
`32`	`32`	`$node->attrGroups,`
`33`	`33`	`Attribute::TARGET_CLASS_CONSTANT,`
`34`	`34`	`'class constant',`
`35`		`- false,`
`36`	`35`	`);`
`37`	`36`	`}`
`38`	`37`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function processNode(Node $node, Scope $scope): array`
`33`	`33`	`$node->getOriginalNode()->attrGroups,`
`34`	`34`	`Attribute::TARGET_FUNCTION,`
`35`	`35`	`'function',`
`36`		`- false,`
`37`	`36`	`);`
`38`	`37`	`}`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public function processNode(Node $node, Scope $scope): array`
`39`	`39`	`$node->attrGroups,`
`40`	`40`	`$targetType,`
`41`	`41`	`$targetName,`
`42`		`- false,`
`43`	`42`	`);`
`44`	`43`	`}`
`45`	`44`