fixes

Author: peterfox

rules/CodingStyle/Rector/Closure/StaticClosureRector.php

@@ -4,9 +4,13 @@
 
 namespace Rector\CodingStyle\Rector\Closure;
 
+use Override;
 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\Rector\AbstractRector;
@@ -71,9 +75,9 @@ public function beforeTraverse(array $nodes): array
 
         $this->traverseNodesWithCallable($nodes, function (Node $node): ?CallLike {
             if (
-                ! $node instanceof Node\Expr\MethodCall
-                && ! $node instanceof Node\Expr\StaticCall
-                && ! $node instanceof Node\Expr\FuncCall
+                ! $node instanceof MethodCall
+                && ! $node instanceof StaticCall
+                && ! $node instanceof FuncCall
             ) {
                 return null;
             }

src/NodeAnalyzer/CallLikeExpectsThisBindedClosureArgsAnalyzer.php

@@ -1,27 +1,38 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Rector\NodeAnalyzer;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Closure;
+use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
 use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Reflection\ReflectionResolver;
-use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
 
 class CallLikeExpectsThisBindedClosureArgsAnalyzer
 {
-    public function __construct(private ReflectionResolver $reflectionResolver)
-    {
+    public function __construct(
+        private readonly ReflectionResolver $reflectionResolver
+    ) {
     }
 
+    /**
+     * @param CallLike $callLike
+     * @return Arg[]
+     * @throws \Rector\Exception\ShouldNotHappenException
+     */
     public function getArgsUsingThisBindedClosure(CallLike $callLike): array
     {
-        /** @var Arg[] $args */
         $args = [];
         $reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($callLike);
 
+        if ($callLike->isFirstClassCallable()) {
+            return [];
+        }
+
         if ($reflection === null) {
             return [];
         }
@@ -38,7 +49,6 @@ public function getArgsUsingThisBindedClosure(CallLike $callLike): array
             }
 
             if ($arg->name?->name !== null) {
-                /** @var ParameterReflectionWithPhpDocs $parameter */
                 foreach ($parameters as $parameter) {
                     $hasObjectBinding = (bool) $parameter->getClosureThisType();
                     if ($hasObjectBinding && $arg->name->name === $parameter->getName()) {
@@ -49,8 +59,7 @@ public function getArgsUsingThisBindedClosure(CallLike $callLike): array
                 continue;
             }
 
-            if ($arg->name?->name === null) {
-                /** @var ParameterReflectionWithPhpDocs $parameter */
+            if (! is_string($arg->name?->name)) {
                 $parameter = $parameters[$index] ?? null;
 
                 if ($parameter === null) {