[CodeQuality] Skip got duplicated method after suffix removed on ActionSuffixRemoverRector (#827)

* [CodeQuality] Skip got duplicated method after suffix removed on ActionSuffixRemoverRector

* Fix

Author: samsonasik

config/sets/symfony/symfony3/symfony32.php

@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use Rector\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueRector;
-use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {

rector.php

@@ -47,9 +47,9 @@
     ])
     ->withPhpSets()
     ->withPreparedSets(
+        deadCode: true,
         codeQuality: true,
         typeDeclarations: true,
-        deadCode: true,
         privatization: true,
         naming: true,
         rectorPreset: true

rules-tests/CodeQuality/Rector/ClassMethod/ActionSuffixRemoverRector/Fixture/skip_method_exists_after_suffixed_removed.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Symfony\Tests\Rector\ClassMethod\ActionSuffixRemoverRector\Fixture;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class SkipMethodExistsAfterSuffixedRemoved extends Controller
+{
+    public function indexAction()
+    {
+        $this->index();
+    }
+
+    private function index()
+    {
+    }
+}

rules/CodeQuality/Rector/ClassMethod/ActionSuffixRemoverRector.php

@@ -8,7 +8,9 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Reflection\ClassReflection;
 use Rector\Rector\AbstractRector;
+use Rector\Reflection\ReflectionResolver;
 use Rector\Symfony\Bridge\NodeAnalyzer\ControllerMethodAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -20,6 +22,7 @@ final class ActionSuffixRemoverRector extends AbstractRector
 {
     public function __construct(
         private readonly ControllerMethodAnalyzer $controllerMethodAnalyzer,
+        private readonly ReflectionResolver $reflectionResolver
     ) {
     }
 
@@ -72,6 +75,13 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $classReflection = $this->reflectionResolver->resolveClassReflection($node);
+        if ($classReflection instanceof ClassReflection
+            && $classReflection->hasNativeMethod(rtrim($node->name->toString(), 'Action'))
+        ) {
+            return null;
+        }
+
         return $this->removeSuffix($node, 'Action');
     }
 

rules/Symfony73/Rector/Class_/AddVoteArgumentToVoteOnAttributeRector.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Rector\AbstractRector;
@@ -112,7 +113,7 @@ public function refactor(Node $node): ?Node
         $classMethod->params[] = new Param(
             new Variable('vote'),
             new ConstFetch(new Name('null')),
-            new Node\NullableType(new FullyQualified(self::VOTE_CLASS))
+            new NullableType(new FullyQualified(self::VOTE_CLASS))
         );
 
         return $node;

rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php

@@ -6,10 +6,11 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
-use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\New_;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use Rector\PhpParser\Node\Value\ValueResolver;
@@ -79,14 +80,14 @@ public function refactor(Node $node): ?Node
         }
 
         $argName = $node->args[0]->name;
-        if ($argName !== null && $argName->name !== 'options') {
+        if ($argName instanceof Identifier && $argName->name !== 'options') {
             return null;
         }
 
         $array = $node->args[0]->value;
         $namedArgs = [];
 
-        foreach ($array->items as $key => $item) {
+        foreach ($array->items as $item) {
             if (! $item instanceof ArrayItem) {
                 continue;
             }
@@ -105,8 +106,8 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $arg = new Node\Arg($item->value);
-            $arg->name = new Node\Identifier($keyValue);
+            $arg = new Arg($item->value);
+            $arg->name = new Identifier($keyValue);
 
             $namedArgs[] = $arg;
         }