Clean MethodToMethodCallRector

rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/Fixture/skip_replace_funcall.php.inc

@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Fixture;
+
+use Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source\FirstDependency;
+
+function aFunctionReturningFirstDependency() : FirstDependency {
+    return new FirstDependency();
+}
+
+aFunctionReturningFirstDependency()->go();
+?>

rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/Fixture/skip_replace_funcall_in_class.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Fixture;
+
+use Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source\FirstDependency;
+
+function aFunctionReturningFirstDependency() : FirstDependency {
+    return new FirstDependency();
+}
+
+class AClass {
+    public function aMethod()
+    {
+        aFunctionReturningFirstDependency()->go();
+    }
+}
+
+?>

rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/Fixture/skip_replace_method_call_from_parent_class.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Fixture;
+
+use Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source\FirstDependency;
+
+class AClass extends FirstDependency{
+
+    public function aMethod()
+    {
+       $this->go();
+    }
+}
+
+?>

rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/Source/FirstDependency.php

@@ -4,7 +4,7 @@
 
 namespace Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source;
 
-final class FirstDependency
+class FirstDependency
 {
     public function go()
     {

rules/Transform/Rector/MethodCall/MethodCallToMethodCallRector.php

@@ -98,24 +98,26 @@ public function refactor(Node $node): ?Node
         }
 
         $isMethodCallCurrentClass = $this->isMethodCallCurrentClass($node);
+
+        if(!$node->var instanceof PropertyFetch && !$node->var instanceof Variable) {
+            return null;
+        }
+
         foreach ($this->methodCallsToMethodsCalls as $methodCallToMethodCall) {
-            if (! $node->var instanceof PropertyFetch && ! $isMethodCallCurrentClass) {
-                continue;
-            }
 
             if (! $this->isMatch($node, $methodCallToMethodCall, $isMethodCallCurrentClass, $class)) {
                 continue;
             }
 
-            /** @var PropertyFetch $propertyFetch */
-            $propertyFetch = $isMethodCallCurrentClass ? $node : $node->var;
-            $newObjectType = new ObjectType($methodCallToMethodCall->getNewType());
-
             $newPropertyName = $this->matchNewPropertyName($methodCallToMethodCall, $class);
             if ($newPropertyName === null) {
                 continue;
             }
 
+            /** @var PropertyFetch $propertyFetch */
+            $propertyFetch = $isMethodCallCurrentClass ? $node : $node->var;
+            $newObjectType = new ObjectType($methodCallToMethodCall->getNewType());
+
             $propertyMetadata = new PropertyMetadata($newPropertyName, $newObjectType, Class_::MODIFIER_PRIVATE);
             $this->propertyToAddCollector->addPropertyToClass($class, $propertyMetadata);
 
@@ -153,15 +155,13 @@ private function isMatch(
     ): bool {
         $oldTypeObject = new ObjectType($methodCallToMethodCall->getOldType());
 
-        if ($isMethodCallCurrentClass) {
+        if($isMethodCallCurrentClass) {
             $className = (string) $this->nodeNameResolver->getName($class);
-            $objectType = new ObjectType($className);
+            $currentClassObjectType = new ObjectType($className);
 
-            if (! $objectType->equals($oldTypeObject)) {
+            if(!$currentClassObjectType->equals($oldTypeObject)) {
                 return false;
             }
-
-            return $this->isName($methodCall->name, $methodCallToMethodCall->getOldMethod());
         }
 
         if (! $this->isObjectType($methodCall->var, $oldTypeObject)) {