[CodingStyle] Skip closure with rebound $this on ArrowFunction/ClosureDelegatingCallToFirstClassCallableRector

rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/Fixture/skip_issue_9964.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector\Fixture;
+
+final class Container9964
+{
+    private array $definitions = [];
+
+    private function addDefinition(string $id, string $definition): void
+    {
+        $this->definitions[$id] = $definition;
+    }
+}
+
+final class ContainerTest9964
+{
+    public function test(): void
+    {
+        $container = new Container9964();
+
+        (fn (string $id, string $definition) => $this->addDefinition($id, $definition))->call(
+            $container,
+            'test',
+            'x',
+        );
+    }
+}

rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/Fixture/skip_rebound_closure.php.inc

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector\Fixture;
+
+final class SkipReboundClosure
+{
+    public function run(object $container)
+    {
+        (fn (string $id, string $definition) => $this->addDefinition($id, $definition))->call($container, 'test', 'x');
+
+        $bound = (fn (string $id, string $definition) => $this->addDefinition($id, $definition))->bindTo($container, $container);
+
+        $bound = \Closure::bind(fn (string $id, string $definition) => $this->addDefinition($id, $definition), $container, $container);
+    }
+
+    private function addDefinition(string $id, string $definition): void
+    {
+    }
+}

rules-tests/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector/Fixture/skip_rebound_closure.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Closure\ClosureDelegatingCallToFirstClassCallableRector\Fixture;
+
+use Closure;
+
+final class SkipReboundClosure
+{
+    public function run(object $container)
+    {
+        (function (string $id) {
+            return $this->addDefinition($id);
+        })->call($container, 'test');
+
+        $bound = (function (string $id) {
+            return $this->addDefinition($id);
+        })->bindTo($container, $container);
+
+        $bound = Closure::bind(function (string $id) {
+            return $this->addDefinition($id);
+        }, $container, $container);
+    }
+
+    private function addDefinition(string $id): void
+    {
+    }
+}

rules/CodingStyle/Guard/ArrowFunctionAndClosureFirstClassCallableGuard.php

@@ -50,6 +50,11 @@ public function shouldSkip(
             return true;
         }
 
+        // $this is rebound, e.g. (fn () => $this->method())->call($object)
+        if ($arrowFunctionOrClosure->getAttribute(AttributeKey::IS_REBOUND_CLOSURE) === true) {
+            return true;
+        }
+
         if ($arrowFunctionOrClosure->getAttribute(
             AttributeKey::IS_ASSIGNED_TO
         ) === true || $arrowFunctionOrClosure->getAttribute(AttributeKey::IS_BEING_ASSIGNED)) {

src/DependencyInjection/LazyContainerFactory.php

@@ -52,6 +52,7 @@
 use Rector\PhpParser\NodeVisitor\LocalVariableScopeNodeVisitor;
 use Rector\PhpParser\NodeVisitor\NameAndArgNodeVisitor;
 use Rector\PhpParser\NodeVisitor\PhpVersionConditionNodeVisitor;
+use Rector\PhpParser\NodeVisitor\ReboundClosureNodeVisitor;
 use Rector\PostRector\Application\PostFileProcessor;
 use Rector\Rector\AbstractRector;
 use Symfony\Component\Console\Application;
@@ -72,6 +73,7 @@ final class LazyContainerFactory
         LocalVariableScopeNodeVisitor::class,
         NameAndArgNodeVisitor::class,
         DefaultValueNodeVisitor::class,
+        ReboundClosureNodeVisitor::class,
     ];
 
     /**

src/NodeTypeResolver/Node/AttributeKey.php

@@ -169,4 +169,9 @@ final class AttributeKey
      * e.g. an array callable passed to a "string|array|null" parameter
      */
     public const string IS_ARG_NOT_ACCEPTING_CLOSURE = 'is_arg_not_accepting_closure';
+
+    /**
+     * Closure or arrow function with rebound $this, e.g. (fn () => ...)->call($object)
+     */
+    public const string IS_REBOUND_CLOSURE = 'is_rebound_closure';
 }

src/PhpParser/NodeVisitor/ReboundClosureNodeVisitor.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PhpParser\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Identifier;
+use PhpParser\NodeVisitorAbstract;
+use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+
+/**
+ * Marks closure/arrow function with rebound $this, e.g. (fn () => ...)->call($object)
+ * @see https://github.com/rectorphp/rector/issues/9964
+ */
+final class ReboundClosureNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
+{
+    public function enterNode(Node $node): ?Node
+    {
+        if (! $node instanceof MethodCall) {
+            return null;
+        }
+
+        if (! $node->var instanceof Closure && ! $node->var instanceof ArrowFunction) {
+            return null;
+        }
+
+        if (! $node->name instanceof Identifier) {
+            return null;
+        }
+
+        if (! in_array($node->name->toLowerString(), ['call', 'bindto'], true)) {
+            return null;
+        }
+
+        $node->var->setAttribute(AttributeKey::IS_REBOUND_CLOSURE, true);
+
+        return null;
+    }
+}