[cleanup] Make FirstClassCallableRector use attributes over node traverser hacks

Author: TomasVotruba

rules/Php81/Rector/Array_/FirstClassCallableRector.php

@@ -12,15 +12,15 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Stmt\ClassConst;
-use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\VariadicPlaceholder;
 use PhpParser\NodeVisitor;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use Rector\NodeCollector\NodeAnalyzer\ArrayCallableMethodMatcher;
 use Rector\NodeCollector\ValueObject\ArrayCallable;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\PhpParser\Enum\TraverseState;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
@@ -86,12 +86,12 @@ public function name()
      */
     public function getNodeTypes(): array
     {
-        return [Property::class, ClassConst::class, Array_::class, Closure::class];
+        return [Array_::class, Closure::class];
     }
 
     /**
-     * @param Property|ClassConst|Array_|Closure $node
-     * @return StaticCall|MethodCall|null|NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN
+     * @param Array_|Closure $node
+     * @return StaticCall|MethodCall|null|TraverseState::*
      */
     public function refactor(Node $node): int|null|StaticCall|MethodCall
     {
@@ -103,10 +103,6 @@ public function refactor(Node $node): int|null|StaticCall|MethodCall
             return null;
         }
 
-        if ($node instanceof Property || $node instanceof ClassConst) {
-            return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
-        }
-
         $scope = ScopeFetcher::fetch($node);
 
         $arrayCallable = $this->arrayCallableMethodMatcher->match($node, $scope);
@@ -119,6 +115,14 @@ public function refactor(Node $node): int|null|StaticCall|MethodCall
             return null;
         }
 
+        if ($node->getAttribute(AttributeKey::IS_DEFAULT_CLASS_CONST_VALUE)) {
+            return null;
+        }
+
+        if ($node->getAttribute(AttributeKey::IS_DEFAULT_PROPERTY_VALUE)) {
+            return null;
+        }
+
         $args = [new VariadicPlaceholder()];
         if ($callerExpr instanceof ClassConstFetch) {
             $type = $this->getType($callerExpr->class);

src/DependencyInjection/LazyContainerFactory.php

@@ -102,6 +102,7 @@
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\ContextNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\GlobalVariableNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\NameNodeVisitor;
+use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\PropertyOrClassConstDefaultNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\StaticVariableNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
@@ -243,6 +244,7 @@ final class LazyContainerFactory
         GlobalVariableNodeVisitor::class,
         NameNodeVisitor::class,
         StaticVariableNodeVisitor::class,
+        PropertyOrClassConstDefaultNodeVisitor::class,
     ];
 
     /**

src/NodeTypeResolver/Node/AttributeKey.php

@@ -286,4 +286,8 @@ final class AttributeKey
      * @var string
      */
     public const HAS_MERGED_COMMENTS = 'has_merged_comments';
+
+    public const IS_DEFAULT_PROPERTY_VALUE = 'is_default_property_value';
+
+    public const IS_DEFAULT_CLASS_CONST_VALUE = 'is_default_class_const_value';
 }

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/PropertyOrClassConstDefaultNodeVisitor.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Stmt\ClassConst;
+use PhpParser\Node\Stmt\Property;
+use PhpParser\NodeVisitorAbstract;
+use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+
+final class PropertyOrClassConstDefaultNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
+{
+    public function enterNode(Node $node): ?Node
+    {
+        if ($node instanceof Property) {
+            foreach ($node->props as $propertyItem) {
+                $default = $propertyItem->default;
+                if (! $default instanceof Expr) {
+                    continue;
+                }
+
+                $default->setAttribute(AttributeKey::IS_DEFAULT_PROPERTY_VALUE, true);
+            }
+        }
+
+        if ($node instanceof ClassConst) {
+            foreach ($node->consts as $const) {
+                $const->value->setAttribute(AttributeKey::IS_DEFAULT_CLASS_CONST_VALUE, true);
+            }
+        }
+
+        return null;
+    }
+}