Merge pull request #792 from kix/issue-770

Fix #770

Author: lsmith77

Routing/Loader/Reader/RestActionReader.php

@@ -179,7 +179,7 @@ public function read(RestRouteCollection $collection, \ReflectionMethod $method,
         }
 
         // generated parameters
-        $routeName    = $this->namePrefix.strtolower($routeName);
+        $routeName    = strtolower($routeName);
         $pattern      = implode('/', $urlParts);
         $defaults     = array('_controller' => $method->getName());
         $requirements = array('_method' => strtoupper($httpMethod));
@@ -546,13 +546,15 @@ private function addRoute(RestRouteCollection $collection, $routeName, $route, $
             $routeName = $routeName.$annotation->getName();
         }
 
+        $fullRouteName = $this->namePrefix.$routeName;
+
         if ($isCollection && !$isInflectable) {
-            $collection->add(self::COLLECTION_ROUTE_PREFIX.$routeName, $route);
-            if (!$collection->get($routeName)) {
-                $collection->add($routeName, clone $route);
+            $collection->add($this->namePrefix.self::COLLECTION_ROUTE_PREFIX.$routeName, $route);
+            if (!$collection->get($fullRouteName)) {
+                $collection->add($fullRouteName, clone $route);
             }
         } else {
-            $collection->add($routeName, $route);
+            $collection->add($fullRouteName, $route);
         }
     }
 }

Tests/Routing/Loader/RestRouteLoaderTest.php

@@ -266,6 +266,18 @@ public function testInformationFixture()
         $this->assertNotSame($getRoute, $cgetRoute);
     }
 
+    /**
+     * @see https://github.com/FriendsOfSymfony/FOSRestBundle/issues/770
+     * @see https://github.com/FriendsOfSymfony/FOSRestBundle/pull/792
+     */
+    public function testNamePrefixIsPrependingCorrectly()
+    {
+        $collection = $this->loadFromControllerFixture('InformationController', 'prefix_');
+
+        $this->assertNotNull($collection->get('prefix_get_information'));
+        $this->assertNotNull($collection->get('prefix_cget_information'));
+    }
+
     /**
      * Load routes collection from fixture class under Tests\Fixtures directory.
      *