Merge pull request #879 from Zeichen32/fix-878

Annotation: Routing name is just appending to generic route name

Author: lsmith77

Routing/Loader/Reader/RestActionReader.php

@@ -535,8 +535,14 @@ private function readMethodAnnotations(\ReflectionMethod $reflectionMethod, $ann
      */
     private function addRoute(RestRouteCollection $collection, $routeName, $route, $isCollection, $isInflectable, RouteAnnotation $annotation = null)
     {
-        if ($annotation) {
-            $routeName = $routeName.$annotation->getName();
+        if ($annotation && null !== $annotation->getName()) {
+            $options = $annotation->getOptions();
+
+            if(isset($options['method_prefix']) && false === $options['method_prefix']) {
+                $routeName = $annotation->getName();
+            } else {
+                $routeName = $routeName.$annotation->getName();
+            }
         }
 
         $fullRouteName = $this->namePrefix.$routeName;

Tests/Fixtures/Controller/AnnotatedUsersController.php

@@ -139,4 +139,12 @@ public function customUserAction($slug)
      */
     public function multiplegetUsersAction()
     {}
+
+    /**
+     * @POST("/users1/{foo}", name="post_users_foo", options={ "method_prefix" = false })
+     * @POST("/users2/{foo}", name="post_users_bar", options={ "method_prefix" = false })
+     *
+     */
+    public function multiplepostUsersAction()
+    {}
 }

Tests/Fixtures/Etalon/annotated_users_controller.yml

@@ -75,3 +75,12 @@ multipleget_users_a_link_method:
   pattern:      /users1.{_format}
   controller:   ::multiplegetUsersAction
   requirements: {_method: LINK}
+
+post_users_foo:
+  pattern:      /users1/{foo}.{_format}
+  controller:   ::multiplepostUsersAction
+  requirements: {_method: POST}
+post_users_bar:
+  pattern:      /users2/{foo}.{_format}
+  controller:   ::multiplepostUsersAction
+  requirements: {_method: POST}

Tests/Routing/Loader/RestRouteLoaderTest.php

@@ -94,7 +94,7 @@ public function testAnnotatedUsersFixture()
         $etalonRoutes   = $this->loadEtalonRoutesInfo('annotated_users_controller.yml');
 
         $this->assertTrue($collection instanceof RestRouteCollection);
-        $this->assertEquals(21, count($collection->all()));
+        $this->assertEquals(23, count($collection->all()));
 
         foreach ($etalonRoutes as $name => $params) {
             $route = $collection->get($name);
@@ -279,6 +279,17 @@ public function testNamePrefixIsPrependingCorrectly()
         $this->assertNotNull($collection->get('prefix_cget_information'));
     }
 
+    /**
+     * @see https://github.com/FriendsOfSymfony/FOSRestBundle/pull/879
+     */
+    public function testNameMethodPrefixIsPrependingCorrectly()
+    {
+        $collection     = $this->loadFromControllerFixture('AnnotatedUsersController');
+
+        $this->assertNotNull($collection->get('post_users_foo'), 'route for "post_users_foo" does not exist');
+        $this->assertNotNull($collection->get('post_users_bar'), 'route for "post_users_bar" does not exist');
+    }
+
     /**
      * Load routes collection from fixture class under Tests\Fixtures directory.
      *