[Symfony30] Reuse existing untyped $request param in GetRequestRector

rules-tests/Symfony30/Rector/ClassMethod/GetRequestRector/Fixture/reuse_untyped_request_param.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Symfony\Tests\Symfony30\Rector\ClassMethod\GetRequestRector\Fixture;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Annotation\Route;
+
+final class ClassWithUntypedRequestParam extends Controller
+{
+    /**
+     * @Route("/some-action", name="some_action")
+     */
+    public function someAction($request)
+    {
+        return $this->getRequest()->getSomething();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Symfony\Tests\Symfony30\Rector\ClassMethod\GetRequestRector\Fixture;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Annotation\Route;
+
+final class ClassWithUntypedRequestParam extends Controller
+{
+    /**
+     * @Route("/some-action", name="some_action")
+     */
+    public function someAction(\Symfony\Component\HttpFoundation\Request $request)
+    {
+        return $request->getSomething();
+    }
+}
+
+?>

rules/Symfony30/Rector/ClassMethod/GetRequestRector.php

@@ -109,6 +109,25 @@ public function refactor(Node $node): ?Node
         return null;
     }
 
+    private function resolveExistingUntypedRequestParam(ClassMethod $classMethod): ?Param
+    {
+        foreach ($classMethod->params as $param) {
+            if ($param->type !== null) {
+                continue;
+            }
+
+            if (! $param->var instanceof Variable) {
+                continue;
+            }
+
+            if ($this->isName($param->var, 'request')) {
+                return $param;
+            }
+        }
+
+        return null;
+    }
+
     private function resolveUniqueName(ClassMethod $classMethod, string $name): string
     {
         $candidateNames = [];
@@ -239,16 +258,23 @@ private function getRequestVariableAndParamName(): string
 
     private function refactorClassMethod(ClassMethod $classMethod): null|ClassMethod
     {
-        $this->requestVariableAndParamName = $this->resolveUniqueName($classMethod, 'request');
-
         if (! $this->isActionWithGetRequestInBody($classMethod)) {
             return null;
         }
 
-        $fullyQualified = new FullyQualified(SymfonyClass::REQUEST);
-        $classMethod->params[] = new Param(new Variable(
-            $this->getRequestVariableAndParamName()
-        ), null, $fullyQualified);
+        $existingUntypedRequestParam = $this->resolveExistingUntypedRequestParam($classMethod);
+        if ($existingUntypedRequestParam instanceof Param) {
+            // reuse an already present, untyped $request param instead of adding a duplicate
+            $existingUntypedRequestParam->type = new FullyQualified(SymfonyClass::REQUEST);
+            $this->requestVariableAndParamName = $this->getName($existingUntypedRequestParam);
+        } else {
+            $this->requestVariableAndParamName = $this->resolveUniqueName($classMethod, 'request');
+
+            $fullyQualified = new FullyQualified(SymfonyClass::REQUEST);
+            $classMethod->params[] = new Param(new Variable(
+                $this->getRequestVariableAndParamName()
+            ), null, $fullyQualified);
+        }
 
         $this->traverseNodesWithCallable((array) $classMethod->stmts, function (Node $node) use (
             $classMethod