[FrameworkBundle] fix removing "action" from route names

nicolas-grekas · nicolas-grekas · commit 98f82fe97c3a · 2021-06-22T13:45:29.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
@@ -43,14 +43,12 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
      */
     protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
     {
-        return preg_replace([
-            '/(bundle|controller)_/',
-            '/action(_\d+)?$/',
-            '/__/',
-        ], [
-            '_',
-            '\\1',
-            '_',
-        ], parent::getDefaultRouteName($class, $method));
+        $name = preg_replace('/(bundle|controller)_/', '_', parent::getDefaultRouteName($class, $method));
+
+        if ('Action' === substr($method->name, -6) || '_action' === substr($method->name, -7)) {
+            $name = preg_replace('/action(_\d+)?$/', '\\1', $name);
+        }
+
+        return str_replace('__', '_', $name);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
@@ -23,6 +23,10 @@ public function testAnnotatedController($path, $expectedValue)
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
         $this->assertSame($expectedValue, $client->getResponse()->getContent());
+
+        $router = self::$container->get('router');
+
+        $this->assertSame('/annotated/create-transaction', $router->generate('symfony_framework_tests_functional_test_annotated_createtransaction'));
     }
 
     public function getRoutes()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php
@@ -48,4 +48,12 @@ public function argumentWithoutDefaultWithRouteParamAndDefaultAction($value)
     {
         return new Response($value);
     }
+
+    /**
+     * @Route("/create-transaction")
+     */
+    public function createTransaction($value)
+    {
+        return new Response($value);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ public function testAnnotatedController($path, $expectedValue)`
`23`	`23`
`24`	`24`	`$this->assertSame(200, $client->getResponse()->getStatusCode());`
`25`	`25`	`$this->assertSame($expectedValue, $client->getResponse()->getContent());`
	`26`	`+`
	`27`	`+ $router = self::$container->get('router');`
	`28`	`+`
	`29`	`+ $this->assertSame('/annotated/create-transaction', $router->generate('symfony_framework_tests_functional_test_annotated_createtransaction'));`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`public function getRoutes()`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,12 @@ public function argumentWithoutDefaultWithRouteParamAndDefaultAction($value)`
`48`	`48`	`{`
`49`	`49`	`return new Response($value);`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ /**`
	`53`	`+ * @Route("/create-transaction")`
	`54`	`+ */`
	`55`	`+ public function createTransaction($value)`
	`56`	`+ {`
	`57`	`+ return new Response($value);`
	`58`	`+ }`
`51`	`59`	`}`