Use MethodCallRename directly (#3077)

phpstan.neon

@@ -781,3 +781,7 @@ parameters:
         -
             path: packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php
             message: '#Offset (.*?)includes(.*?) always exists and is not nullable#'
+
+        -
+            message: '#Value object "MethodCallRename" should be named "RenameMethod" instead to respect used service#'
+            path: config/set/gmagick-to-imagick.php

rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php

@@ -5,7 +5,6 @@
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
-use Rector\Renaming\ValueObject\MethodCallRenameWithArrayKey;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\AbstractType;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\CustomType;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\DifferentInterface;
@@ -22,7 +21,5 @@
         new MethodCallRename(Foo::class, 'old', 'new'),
         new MethodCallRename(NewInterface::class, 'some_old', 'some_new'),
         new MethodCallRename(DifferentInterface::class, 'renameMe', 'toNewVersion'),
-        // with array key
-        new MethodCallRenameWithArrayKey('Nette\Utils\Html', 'addToArray', 'addToHtmlArray', 'hey'),
     ]);
 };

rules/Renaming/Collector/MethodCallRenameCollector.php

@@ -4,25 +4,25 @@
 
 namespace Rector\Renaming\Collector;
 
-use Rector\Renaming\Contract\MethodCallRenameInterface;
+use Rector\Renaming\ValueObject\MethodCallRename;
 
 final class MethodCallRenameCollector
 {
     /**
-     * @var MethodCallRenameInterface[]
+     * @var MethodCallRename[]
      */
     private array $methodCallRenames = [];
 
     /**
-     * @param MethodCallRenameInterface[] $methodCallRenames
+     * @param MethodCallRename[] $methodCallRenames
      */
     public function addMethodCallRenames(array $methodCallRenames): void
     {
         $this->methodCallRenames = array_merge($this->methodCallRenames, $methodCallRenames);
     }
 
     /**
-     * @return MethodCallRenameInterface[]
+     * @return MethodCallRename[]
      */
     public function getMethodCallRenames(): array
     {

rules/Renaming/Rector/MethodCall/RenameMethodRector.php

@@ -4,9 +4,7 @@
 
 namespace Rector\Renaming\Rector\MethodCall;
 
-use PhpParser\BuilderHelpers;
 use PhpParser\Node;
-use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
@@ -20,9 +18,7 @@
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Renaming\Collector\MethodCallRenameCollector;
-use Rector\Renaming\Contract\MethodCallRenameInterface;
 use Rector\Renaming\ValueObject\MethodCallRename;
-use Rector\Renaming\ValueObject\MethodCallRenameWithArrayKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
@@ -33,7 +29,7 @@
 final class RenameMethodRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
 {
     /**
-     * @var MethodCallRenameInterface[]
+     * @var MethodCallRename[]
      */
     private array $methodCallRenames = [];
 
@@ -100,11 +96,6 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             }
 
             $node->name = new Identifier($methodCallRename->getNewMethod());
-
-            if ($methodCallRename instanceof MethodCallRenameWithArrayKey && ! $node instanceof ClassMethod) {
-                return new ArrayDimFetch($node, BuilderHelpers::normalizeValue($methodCallRename->getArrayKey()));
-            }
-
             return $node;
         }
 
@@ -116,15 +107,15 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
      */
     public function configure(array $configuration): void
     {
-        Assert::allIsAOf($configuration, MethodCallRenameInterface::class);
+        Assert::allIsAOf($configuration, MethodCallRename::class);
 
         $this->methodCallRenames = $configuration;
         $this->methodCallRenameCollector->addMethodCallRenames($configuration);
     }
 
     private function shouldSkipClassMethod(
         MethodCall | StaticCall | ClassMethod $node,
-        MethodCallRenameInterface $methodCallRename
+        MethodCallRename $methodCallRename
     ): bool {
         if (! $node instanceof ClassMethod) {
             $classReflection = $this->reflectionResolver->resolveClassReflectionSourceObject($node);
@@ -156,7 +147,7 @@ private function shouldSkipClassMethod(
 
     private function shouldSkipForAlreadyExistingClassMethod(
         ClassMethod $classMethod,
-        MethodCallRenameInterface $methodCallRename
+        MethodCallRename $methodCallRename
     ): bool {
         $classLike = $this->betterNodeFinder->findParentType($classMethod, ClassLike::class);
         if (! $classLike instanceof ClassLike) {
@@ -167,7 +158,7 @@ private function shouldSkipForAlreadyExistingClassMethod(
     }
 
     private function shouldKeepForParentInterface(
-        MethodCallRenameInterface $methodCallRename,
+        MethodCallRename $methodCallRename,
         ClassMethod|StaticCall|MethodCall $node,
         ?ClassReflection $classReflection
     ): bool {

rules/Renaming/ValueObject/MethodCallRename.php

@@ -6,9 +6,8 @@
 
 use PHPStan\Type\ObjectType;
 use Rector\Core\Validation\RectorAssert;
-use Rector\Renaming\Contract\MethodCallRenameInterface;
 
-final class MethodCallRename implements MethodCallRenameInterface
+final class MethodCallRename
 {
     public function __construct(
         private readonly string $class,