[NodeTypeResolver] Clean up unnecessary scope attribute set on Class_…

…/Interface_/Enum_ (#6316) * [NodeTypeResolver] Clean up unnecessary attribute set on Class_/Interface_/Enum_ * add test * Reduce instanceof check
rectorphp · Sep 18, 2024 · 886efb0 · 886efb0
1 parent 71a0da8
commit 886efb0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...ests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_in_attribute_class.php.inc b/...ests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_in_attribute_class.php.inc
@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
+
+#[SomeAttribute(['array-argument'])]
+class SkipInAttributeClass
+{
+}
diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -136,7 +136,6 @@ public function processNodes(
                 /** @var MutatingScope $mutatingScope */
                 $mutatingScope = $this->resolveClassOrInterfaceScope($node, $mutatingScope);
                 $node->setAttribute(AttributeKey::SCOPE, $mutatingScope);
-                $this->decorateNodeAttrGroups($node, $mutatingScope, $nodeCallback);
 
                 return;
             }
@@ -163,13 +162,13 @@ public function processNodes(
                 $node->setAttribute(AttributeKey::SCOPE, $mutatingScope);
             }
 
-            $this->decorateNodeAttrGroups($node, $mutatingScope, $nodeCallback);
-
             if ($node instanceof FileWithoutNamespace) {
                 $this->nodeScopeResolverProcessNodes($node->stmts, $mutatingScope, $nodeCallback);
                 return;
             }
 
+            $this->decorateNodeAttrGroups($node, $mutatingScope, $nodeCallback);
+
             if ((
                 $node instanceof Expression ||
                 $node instanceof Return_ ||