working

Author: peterfox

composer.json

@@ -98,7 +98,8 @@
             "tests/debug_functions.php",
             "rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Source/some_view_function.php",
             "rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/Source/FunctionTyped.php",
-            "rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/Source/ParentClass.php"
+            "rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/Source/ParentClass.php",
+            "rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Source/functions.php"
         ]
     },
     "scripts": {

rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Fixture/fixture_with_named_this_binding.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Fixture;
+
+use Closure;
+use Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject;
+
+class FixtureWithNamedThisBinding
+{
+    public function first()
+    {
+        return BindObject::call(closure: function () {
+            return 'bar';
+        }, closureTwo: function () {
+            return 'foo';
+        });
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Fixture;
+
+use Closure;
+use Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject;
+
+class FixtureWithNamedThisBinding
+{
+    public function first()
+    {
+        return BindObject::call(closure: function () {
+            return 'bar';
+        }, closureTwo: static function () {
+            return 'foo';
+        });
+    }
+}
+
+?>

rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Fixture/skip_use_with_context_binding.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject;
+
+BindObject::call(closure: function () {
+    echo 'static call';
+});
+
+(new BindObject())->callOnObject(function () {
+    echo 'method call';
+});
+
+bind_on_object(function () {
+    echo 'closure func call 0';
+}, null, function () {
+    echo 'closure func call 0';
+});
+
+?>

rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Source/BindObject.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source;
+
+class BindObject
+{
+    /**
+     * @param-closure-this \Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject $closure
+     */
+    public static function call(\Closure $closure, \Closure|null $closureTwo = null)
+    {
+
+    }
+
+    /**
+     * @param-closure-this \Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject $closure
+     */
+    public function callOnObject(\Closure $closure)
+    {
+
+    }
+}

rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Source/functions.php

@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @param-closure-this \Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject $closure
+ * @param-closure-this \Rector\Tests\CodingStyle\Rector\Closure\StaticClosureRector\Source\BindObject $closureFinally
+ */
+function bind_on_object(Closure|null $closure = null, Closure|null $anotherClosure = null, Closure|null $closureFinally = null)
+{
+
+}

rules/CodingStyle/Rector/Closure/StaticClosureRector.php

@@ -5,8 +5,10 @@
 namespace Rector\CodingStyle\Rector\Closure;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Closure;
 use Rector\CodingStyle\Guard\StaticGuard;
+use Rector\NodeAnalyzer\CallLikeExpectsThisBindedClosureArgsAnalyzer;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -16,8 +18,11 @@
  */
 final class StaticClosureRector extends AbstractRector
 {
+    private const CLOSURE_USES_THIS = 'has_this_closure';
+
     public function __construct(
-        private readonly StaticGuard $staticGuard
+        private readonly StaticGuard $staticGuard,
+        private readonly CallLikeExpectsThisBindedClosureArgsAnalyzer $callLikeExpectsThisBindedClosureArgsAnalyzer
     ) {
     }
 
@@ -59,11 +64,51 @@ public function getNodeTypes(): array
         return [Closure::class];
     }
 
+    #[Override]
+    public function beforeTraverse(array $nodes): array
+    {
+        parent::beforeTraverse($nodes);
+
+        $this->traverseNodesWithCallable($nodes, function (Node $node): ?CallLike {
+            if (
+                ! $node instanceof Node\Expr\MethodCall
+                && ! $node instanceof Node\Expr\StaticCall
+                && ! $node instanceof Node\Expr\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)) {
+            return null;
+        }
+
         if (! $this->staticGuard->isLegal($node)) {
             return null;
         }

src/NodeAnalyzer/CallLikeExpectsThisBindedClosureArgsAnalyzer.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Rector\NodeAnalyzer;
+
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\CallLike;
+use PhpParser\Node\Expr\Closure;
+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 getArgsUsingThisBindedClosure(CallLike $callLike): array
+    {
+        /** @var Arg[] $args */
+        $args = [];
+        $reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($callLike);
+
+        if ($reflection === null) {
+            return [];
+        }
+
+        $scope = ScopeFetcher::fetch($callLike);
+
+        $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($reflection, $callLike, $scope);
+        $parameters = $parametersAcceptor->getParameters();
+
+        foreach ($callLike->getArgs() as $index => $arg) {
+
+            if (! $arg->value instanceof Closure) {
+                continue;
+            }
+
+            if ($arg->name?->name !== null) {
+                /** @var ParameterReflectionWithPhpDocs $parameter */
+                foreach ($parameters as $parameter) {
+                    $hasObjectBinding = (bool) $parameter->getClosureThisType();
+                    if ($hasObjectBinding && $arg->name->name === $parameter->getName()) {
+                        $args[] = $arg;
+                    }
+                }
+
+                continue;
+            }
+
+            if ($arg->name?->name === null) {
+                /** @var ParameterReflectionWithPhpDocs $parameter */
+                $parameter = $parameters[$index] ?? null;
+
+                if ($parameter === null) {
+                    continue;
+                }
+
+                if ($parameter->getClosureThisType() !== null) {
+                    $args[] = $arg;
+                }
+            }
+        }
+
+        return $args;
+    }
+}