[Php70] Skip rewriting to $this on static method or static closure on StaticCallOnNonStaticToInstanceCallRector

rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_static_closure_same_class_call.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector\Fixture;
+
+class SkipStaticClosureSameClassCall
+{
+    public function boot(): void
+    {
+        // static closure — no $this, must not rewrite
+        $callback = static function (): void {
+            SkipStaticClosureSameClassCall::doWork();
+        };
+    }
+
+    public function doWork(): void
+    {
+    }
+}

rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_static_method_same_class_call.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector\Fixture;
+
+class SkipStaticMethodSameClassCall
+{
+    public static function run(): string
+    {
+        // enclosing function is static — no $this, must not rewrite
+        return SkipStaticMethodSameClassCall::doWork();
+    }
+
+    public function doWork(): string
+    {
+        return 'work done';
+    }
+}

rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php

@@ -126,6 +126,11 @@ public function refactor(Node $node): ?Node
 
         $classReflection = $scope->getClassReflection();
         if ($classReflection instanceof ClassReflection && $classReflection->getName() === $className) {
+            // detect any scope where $this is unavailable or possibly unavailable
+            if (! $scope->hasVariableType('this')->yes()) {
+                return null;
+            }
+
             return new MethodCall(new Variable('this'), $node->name, $node->args);
         }