wip

Author: peterfox

rules/CodingStyle/Rector/Closure/StaticClosureRector.php

@@ -5,13 +5,10 @@
 namespace Rector\CodingStyle\Rector\Closure;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Closure;
-use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Expr\StaticCall;
 use Rector\CodingStyle\Guard\StaticGuard;
-use Rector\NodeAnalyzer\CallLikeExpectsThisBindedClosureArgsAnalyzer;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\CallLikeThisBoundClosureArgsNodeVisitor;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -21,11 +18,8 @@
  */
 final class StaticClosureRector extends AbstractRector
 {
-    private const CLOSURE_USES_THIS = 'has_this_closure';
-
     public function __construct(
         private readonly StaticGuard $staticGuard,
-        private readonly CallLikeExpectsThisBindedClosureArgsAnalyzer $callLikeExpectsThisBindedClosureArgsAnalyzer
     ) {
     }
 
@@ -67,47 +61,12 @@ public function getNodeTypes(): array
         return [Closure::class];
     }
 
-    public function beforeTraverse(array $nodes): array
-    {
-        parent::beforeTraverse($nodes);
-
-        $this->traverseNodesWithCallable($nodes, function (Node $node): ?CallLike {
-            if (
-                ! $node instanceof MethodCall
-                && ! $node instanceof StaticCall
-                && ! $node instanceof FuncCall
-            ) {
-                return null;
-            }
-
-            if ($node->isFirstClassCallable()) {
-                return null;
-            }
-
-            $args = $this->callLikeExpectsThisBindedClosureArgsAnalyzer->getArgsUsingThisBindedClosure($node);
-
-            if ($args === []) {
-                return null;
-            }
-
-            foreach ($args as $arg) {
-                if ($arg->value instanceof Closure && ! $arg->hasAttribute(self::CLOSURE_USES_THIS)) {
-                    $arg->value->setAttribute(self::CLOSURE_USES_THIS, true);
-                }
-            }
-
-            return $node;
-        });
-
-        return $nodes;
-    }
-
     /**
      * @param Closure $node
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->hasAttribute(self::CLOSURE_USES_THIS)) {
+        if ($node->hasAttribute(AttributeKey::CLOSURE_USES_THIS)) {
             return null;
         }
 

src/DependencyInjection/LazyContainerFactory.php

@@ -100,6 +100,7 @@
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\AssignedToNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\ByRefReturnNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\ByRefVariableNodeVisitor;
+use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\CallLikeThisBoundClosureArgsNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\ClassConstFetchNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\ContextNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\GlobalVariableNodeVisitor;
@@ -252,6 +253,7 @@ final class LazyContainerFactory
         StaticVariableNodeVisitor::class,
         PropertyOrClassConstDefaultNodeVisitor::class,
         ClassConstFetchNodeVisitor::class,
+        CallLikeThisBoundClosureArgsNodeVisitor::class,
     ];
 
     /**

src/NodeAnalyzer/CallLikeExpectsThisBindedClosureArgsAnalyzer.php

@@ -8,6 +8,7 @@
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Closure;
 use PHPStan\Reflection\ExtendedParameterReflection;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Reflection\ReflectionResolver;
@@ -35,7 +36,7 @@ public function getArgsUsingThisBindedClosure(CallLike $callLike): array
             return [];
         }
 
-        $scope = ScopeFetcher::fetch($callLike);
+        $scope = $callLike->getAttribute(AttributeKey::SCOPE);
 
         $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($reflection, $callLike, $scope);
         $parameters = $parametersAcceptor->getParameters();

src/NodeTypeResolver/Node/AttributeKey.php

@@ -288,4 +288,6 @@ final class AttributeKey
     public const CLASS_CONST_FETCH_NAME = 'class_const_fetch_name';
 
     public const PHP_VERSION_CONDITIONED = 'php_version_conditioned';
+
+    public const CLOSURE_USES_THIS = 'has_this_closure';
 }

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

@@ -0,0 +1,52 @@
+<?php
+
+namespace Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\NodeVisitorAbstract;
+use PHPStan\Type\Type;
+use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
+use Rector\NodeAnalyzer\CallLikeExpectsThisBindedClosureArgsAnalyzer;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+
+class CallLikeThisBoundClosureArgsNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
+{
+    public function __construct(
+        private readonly CallLikeExpectsThisBindedClosureArgsAnalyzer $callLikeExpectsThisBindedClosureArgsAnalyzer
+    )
+    {
+    }
+
+    public function enterNode(Node $node): ?Node
+    {
+        if (
+            ! $node instanceof MethodCall
+            && ! $node instanceof StaticCall
+            && ! $node instanceof FuncCall
+        ) {
+            return null;
+        }
+
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
+        $args = $this->callLikeExpectsThisBindedClosureArgsAnalyzer->getArgsUsingThisBindedClosure($node);
+
+        if ($args === []) {
+            return null;
+        }
+
+        foreach ($args as $arg) {
+            if ($arg->value instanceof Closure && ! $arg->hasAttribute(AttributeKey::CLOSURE_USES_THIS)) {
+                $arg->value->setAttribute(AttributeKey::CLOSURE_USES_THIS, true);
+            }
+        }
+
+        return $node;
+    }
+}