extend MethodCallRenameInterface contract with getClass() (#1129)

rectorphp · Nov 2, 2021 · 954ffad · 954ffad
1 parent df23327
commit 954ffad
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/rules/Renaming/Contract/MethodCallRenameInterface.php b/rules/Renaming/Contract/MethodCallRenameInterface.php
@@ -8,7 +8,9 @@
 
 interface MethodCallRenameInterface
 {
-    public function getOldObjectType(): ObjectType;
+    public function getClass(): string;
+
+    public function getObjectType(): ObjectType;
 
     public function getOldMethod(): string;
 

diff --git a/rules/Renaming/Rector/MethodCall/RenameMethodRector.php b/rules/Renaming/Rector/MethodCall/RenameMethodRector.php
@@ -83,7 +83,7 @@ public function refactor(Node $node): ?Node
     {
         foreach ($this->methodCallRenames as $methodCallRename) {
             $implementsInterface = $this->classManipulator->hasParentMethodOrInterface(
-                $methodCallRename->getOldObjectType(),
+                $methodCallRename->getObjectType(),
                 $methodCallRename->getOldMethod()
             );
             if ($implementsInterface) {
@@ -92,7 +92,7 @@ public function refactor(Node $node): ?Node
 
             if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
                 $node,
-                $methodCallRename->getOldObjectType()
+                $methodCallRename->getObjectType()
             )) {
                 continue;
             }

diff --git a/rules/Renaming/ValueObject/MethodCallRename.php b/rules/Renaming/ValueObject/MethodCallRename.php
@@ -10,15 +10,20 @@
 final class MethodCallRename implements MethodCallRenameInterface
 {
     public function __construct(
-        private string $oldClass,
+        private string $class,
         private string $oldMethod,
         private string $newMethod
     ) {
     }
 
-    public function getOldObjectType(): ObjectType
+    public function getClass(): string
     {
-        return new ObjectType($this->oldClass);
+        return $this->class;
+    }
+
+    public function getObjectType(): ObjectType
+    {
+        return new ObjectType($this->class);
     }
 
     public function getOldMethod(): string

diff --git a/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php b/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php
@@ -13,16 +13,21 @@ final class MethodCallRenameWithArrayKey implements MethodCallRenameInterface
      * @param mixed $arrayKey
      */
     public function __construct(
-        private string $oldClass,
+        private string $class,
         private string $oldMethod,
         private string $newMethod,
-        private $arrayKey
+        private        $arrayKey
     ) {
     }
 
-    public function getOldObjectType(): ObjectType
+    public function getClass(): string
     {
-        return new ObjectType($this->oldClass);
+        return $this->class;
+    }
+
+    public function getObjectType(): ObjectType
+    {
+        return new ObjectType($this->class);
     }
 
     public function getOldMethod(): string