Fix StaticCallOnNonStaticToInstanceCallRector to skip parent's parent…

…'s method calls. (#4098) [Issue 7974](rectorphp/rector#7974) Co-authored-by: Alexey Klimko <aklimko@sugarcrm.com>
rectorphp · Jun 7, 2023 · 8cc8c7c · 8cc8c7c
1 parent 3c9a245
commit 8cc8c7c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/...cCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_parent_method.php.inc b/...cCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_parent_method.php.inc
@@ -0,0 +1,26 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector\Fixture;
+
+class Grandpa
+{
+    protected function test()
+    {
+    }
+}
+
+class Father extends Grandpa
+{
+    protected function test()
+    {
+        parent::test();
+    }
+}
+
+class Son extends Father
+{
+    protected function test()
+    {
+        Grandpa::test();
+    }
+}
diff --git a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
@@ -11,6 +11,7 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ObjectType;
@@ -167,6 +168,11 @@ private function shouldSkip(string $methodName, string $className, StaticCall $s
             return true;
         }
 
+        $reflection = $scope->getClassReflection();
+        if ($reflection instanceof ClassReflection && $reflection->isSubclassOf($className)) {
+            return true;
+        }
+
         $className = $this->getName($staticCall->class);
         if (in_array($className, [ObjectReference::PARENT, ObjectReference::SELF, ObjectReference::STATIC], true)) {
             return true;