handle nested arrays as well

Author: TomasVotruba

rules-tests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_on_class_const.php.inc

@@ -6,6 +6,10 @@ final class SkipOnClassConst
 {
     private const CLASS_CONST = [SkipOnClassConst::class, 'size'];
 
+    private const CLASS_CONST_NESTED = [
+        'hey' => [SkipOnClassConst::class, 'size']
+    ];
+
     public function size()
     {
     }

rules-tests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_on_property.php.inc

@@ -6,6 +6,10 @@ final class SkipOnProperty
 {
     private $prop = [SkipOnProperty::class, 'size'];
 
+    private $nestedProperty = [
+        'some_callback' => [SkipOnProperty::class, 'size']
+    ];
+
     public function size()
     {
     }

rules/Php81/Rector/Array_/FirstClassCallableRector.php

@@ -31,6 +31,7 @@
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
+ * @see RFC https://wiki.php.net/rfc/first_class_callable_syntax
  * @see \Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\FirstClassCallableRectorTest
  */
 final class FirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
@@ -45,7 +46,6 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        // see RFC https://wiki.php.net/rfc/first_class_callable_syntax
         return new RuleDefinition('Upgrade array callable to first class callable', [
             new CodeSample(
                 <<<'CODE_SAMPLE'
@@ -114,7 +114,7 @@ public function refactor(Node $node): StaticCall|MethodCall|null|int
             return null;
         }
 
-        if ($node->getAttribute(AttributeKey::IS_DEFAULT_CLASS_CONST_VALUE)) {
+        if ($node->getAttribute(AttributeKey::IS_CLASS_CONST_VALUE)) {
             return null;
         }
 

src/NodeTypeResolver/Node/AttributeKey.php

@@ -289,5 +289,5 @@ final class AttributeKey
 
     public const IS_DEFAULT_PROPERTY_VALUE = 'is_default_property_value';
 
-    public const IS_DEFAULT_CLASS_CONST_VALUE = 'is_default_class_const_value';
+    public const IS_CLASS_CONST_VALUE = 'is_default_class_const_value';
 }

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

@@ -11,6 +11,7 @@
 use PhpParser\NodeVisitorAbstract;
 use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\PhpParser\NodeTraverser\SimpleTraverser;
 
 final class PropertyOrClassConstDefaultNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
 {
@@ -23,13 +24,13 @@ public function enterNode(Node $node): ?Node
                     continue;
                 }
 
-                $default->setAttribute(AttributeKey::IS_DEFAULT_PROPERTY_VALUE, true);
+                SimpleTraverser::decorateWithTrueAttribute($default, AttributeKey::IS_DEFAULT_PROPERTY_VALUE);
             }
         }
 
         if ($node instanceof ClassConst) {
             foreach ($node->consts as $const) {
-                $const->value->setAttribute(AttributeKey::IS_DEFAULT_CLASS_CONST_VALUE, true);
+                SimpleTraverser::decorateWithTrueAttribute($const->value, AttributeKey::IS_CLASS_CONST_VALUE);
             }
         }
 

src/PhpParser/NodeTraverser/SimpleTraverser.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PhpParser\NodeTraverser;
+
+use PhpParser\Node;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitorAbstract;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+
+final class SimpleTraverser
+{
+    /**
+     * @param Node[]|Node $nodesOrNode
+     * @param AttributeKey::* $attributeKey
+     */
+    public static function decorateWithTrueAttribute(array|Node $nodesOrNode, string $attributeKey): void
+    {
+        $callableNodeVisitor = new class($attributeKey) extends NodeVisitorAbstract {
+            public function __construct(
+                private readonly string $attributeKey
+            ) {
+            }
+
+            public function enterNode(Node $node)
+            {
+                $node->setAttribute($this->attributeKey, true);
+                return null;
+            }
+        };
+
+        $nodeTraverser = new NodeTraverser($callableNodeVisitor);
+
+        $nodes = $nodesOrNode instanceof Node ? [$nodesOrNode] : $nodesOrNode;
+        $nodeTraverser->traverse($nodes);
+    }
+}