Fix issue #878

Author: Jens Averkamp

Routing/Loader/Reader/RestActionReader.php

@@ -535,8 +535,8 @@ 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()) {
+            $routeName = $annotation->getName();
         }
 
         $fullRouteName = $this->namePrefix.$routeName;

Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php

@@ -136,10 +136,10 @@ public function conditionalUserAction()
     {}
 
     /**
-     * @Link("/users1", name="_a_link_method", condition="context.getMethod() in ['LINK'] and request.headers.get('User-Agent') matches '/firefox/i'")
-     * @Get("/users2",  name="_a_get_method", condition="context.getMethod() in ['GET'] and request.headers.get('User-Agent') matches '/firefox/i'")
-     * @Get("/users3",  name="_an_other_get_method")
-     * @Post("/users4",  name="_a_post_method", condition="context.getMethod() in ['POST'] and request.headers.get('User-Agent') matches '/firefox/i'")
+     * @Link("/users1", name="multipleget_users_a_link_method", condition="context.getMethod() in ['LINK'] and request.headers.get('User-Agent') matches '/firefox/i'")
+     * @Get("/users2",  name="multipleget_users_a_get_method", condition="context.getMethod() in ['GET'] and request.headers.get('User-Agent') matches '/firefox/i'")
+     * @Get("/users3",  name="multipleget_users_an_other_get_method")
+     * @Post("/users4",  name="multipleget_users_a_post_method", condition="context.getMethod() in ['POST'] and request.headers.get('User-Agent') matches '/firefox/i'")
      *
      */
     public function multiplegetUsersAction()

Tests/Fixtures/Controller/AnnotatedUsersController.php

@@ -131,10 +131,10 @@ public function customUserAction($slug)
     {}
 
     /**
-     * @Link("/users1", name="_a_link_method")
-     * @Get("/users2",  name="_a_get_method")
-     * @Get("/users3",  name="_an_other_get_method")
-     * @Post("/users4",  name="_a_post_method")
+     * @Link("/users1", name="multipleget_users_a_link_method")
+     * @Get("/users2",  name="multipleget_users_a_get_method")
+     * @Get("/users3",  name="multipleget_users_an_other_get_method")
+     * @Post("/users4",  name="multipleget_users_a_post_method")
      *
      */
     public function multiplegetUsersAction()