fixes

Author: peterfox

rules/CodingStyle/Rector/Closure/StaticClosureRector.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Expr\Closure;
 use Rector\CodingStyle\Guard\StaticGuard;
 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;
@@ -66,7 +65,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->hasAttribute(AttributeKey::CLOSURE_USES_THIS)) {
+        if ($node->hasAttribute(AttributeKey::IS_CLOSURE_USES_THIS)) {
             return null;
         }
 

src/NodeAnalyzer/CallLikeExpectsThisBindedClosureArgsAnalyzer.php

@@ -8,7 +8,6 @@
 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;
@@ -36,8 +35,7 @@ public function getArgsUsingThisBindedClosure(CallLike $callLike): array
             return [];
         }
 
-        $scope = $callLike->getAttribute(AttributeKey::SCOPE);
-
+        $scope = ScopeFetcher::fetch($callLike);
         $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($reflection, $callLike, $scope);
         $parameters = $parametersAcceptor->getParameters();
 

src/NodeTypeResolver/Node/AttributeKey.php

@@ -289,5 +289,5 @@ final class AttributeKey
 
     public const PHP_VERSION_CONDITIONED = 'php_version_conditioned';
 
-    public const CLOSURE_USES_THIS = 'has_this_closure';
+    public const IS_CLOSURE_USES_THIS = 'has_this_closure';
 }

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

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor;
 
 use PhpParser\Node;
@@ -8,7 +10,6 @@
 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;
@@ -17,8 +18,7 @@ class CallLikeThisBoundClosureArgsNodeVisitor extends NodeVisitorAbstract implem
 {
     public function __construct(
         private readonly CallLikeExpectsThisBindedClosureArgsAnalyzer $callLikeExpectsThisBindedClosureArgsAnalyzer
-    )
-    {
+    ) {
     }
 
     public function enterNode(Node $node): ?Node
@@ -42,8 +42,8 @@ public function enterNode(Node $node): ?Node
         }
 
         foreach ($args as $arg) {
-            if ($arg->value instanceof Closure && ! $arg->hasAttribute(AttributeKey::CLOSURE_USES_THIS)) {
-                $arg->value->setAttribute(AttributeKey::CLOSURE_USES_THIS, true);
+            if ($arg->value instanceof Closure && ! $arg->hasAttribute(AttributeKey::IS_CLOSURE_USES_THIS)) {
+                $arg->value->setAttribute(AttributeKey::IS_CLOSURE_USES_THIS, true);
             }
         }