Attributes rules use In*Node virtual nodes for more precise Scope

phpstan · Dec 20, 2024 · 90e48fa · 90e48fa
1 parent c5df243
commit 90e48fa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/Rules/Functions/ArrowFunctionAttributesRule.php b/src/Rules/Functions/ArrowFunctionAttributesRule.php
@@ -5,11 +5,12 @@
 use Attribute;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\InArrowFunctionNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Expr\ArrowFunction>
+ * @implements Rule<InArrowFunctionNode>
  */
 final class ArrowFunctionAttributesRule implements Rule
 {
@@ -20,14 +21,14 @@ public function __construct(private AttributesCheck $attributesCheck)
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\ArrowFunction::class;
+		return InArrowFunctionNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
 		return $this->attributesCheck->check(
 			$scope,
-			$node->attrGroups,
+			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
 		);

diff --git a/src/Rules/Functions/ClosureAttributesRule.php b/src/Rules/Functions/ClosureAttributesRule.php
@@ -5,11 +5,12 @@
 use Attribute;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\InClosureNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Expr\Closure>
+ * @implements Rule<InClosureNode>
  */
 final class ClosureAttributesRule implements Rule
 {
@@ -20,14 +21,14 @@ public function __construct(private AttributesCheck $attributesCheck)
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\Closure::class;
+		return InClosureNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
 		return $this->attributesCheck->check(
 			$scope,
-			$node->attrGroups,
+			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
 		);

diff --git a/src/Rules/Functions/FunctionAttributesRule.php b/src/Rules/Functions/FunctionAttributesRule.php
@@ -5,11 +5,12 @@
 use Attribute;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\InFunctionNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Stmt\Function_>
+ * @implements Rule<InFunctionNode>
  */
 final class FunctionAttributesRule implements Rule
 {
@@ -20,14 +21,14 @@ public function __construct(private AttributesCheck $attributesCheck)
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt\Function_::class;
+		return InFunctionNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
 		return $this->attributesCheck->check(
 			$scope,
-			$node->attrGroups,
+			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_FUNCTION,
 			'function',
 		);

diff --git a/src/Rules/Methods/MethodAttributesRule.php b/src/Rules/Methods/MethodAttributesRule.php
@@ -5,11 +5,12 @@
 use Attribute;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\InClassMethodNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Stmt\ClassMethod>
+ * @implements Rule<InClassMethodNode>
  */
 final class MethodAttributesRule implements Rule
 {
@@ -20,14 +21,14 @@ public function __construct(private AttributesCheck $attributesCheck)
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt\ClassMethod::class;
+		return InClassMethodNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
 		return $this->attributesCheck->check(
 			$scope,
-			$node->attrGroups,
+			$node->getOriginalNode()->attrGroups,
 			Attribute::TARGET_METHOD,
 			'method',
 		);