[Routing] added the possibility to define a prefix for all routes of a controller

fabpot · fabpot · commit 58e14aaba995 · 2017-08-29T15:18:24.000-07:00
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Added the possibility to define a prefix for all routes of a controller via @Route(name="prefix_")
  * Added support for prioritized routing loaders.
  * Add matched and default parameters to redirect responses
  * Added support for a `controller` keyword for configuring route controllers in YAML and XML configurations.
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -141,6 +141,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
         if (null === $name) {
             $name = $this->getDefaultRouteName($class, $method);
         }
+        $name = $globals['name'].$name;
 
         $defaults = array_replace($globals['defaults'], $annot->getDefaults());
         foreach ($method->getParameters() as $param) {
@@ -222,9 +223,14 @@ protected function getGlobals(\ReflectionClass $class)
             'methods' => array(),
             'host' => '',
             'condition' => '',
+            'name' => '',
         );
 
         if ($annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
+            if (null !== $annot->getName()) {
+                $globals['name'] = $annot->getName();
+            }
+
             if (null !== $annot->getPath()) {
                 $globals['path'] = $annot->getPath();
             }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -149,6 +149,7 @@ public function testLoad($className, $routeData = array(), $methodArgs = array()
     public function testClassRouteLoad()
     {
         $classRouteData = array(
+            'name' => 'prefix_',
             'path' => '/prefix',
             'schemes' => array('https'),
             'methods' => array('GET'),
@@ -173,7 +174,7 @@ public function testClassRouteLoad()
         ;
 
         $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass');
-        $route = $routeCollection->get($methodRouteData['name']);
+        $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);
 
         $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
         $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public function testLoad($className, $routeData = array(), $methodArgs = array()`
`149`	`149`	`public function testClassRouteLoad()`
`150`	`150`	`{`
`151`	`151`	`$classRouteData = array(`
	`152`	`+ 'name' => 'prefix_',`
`152`	`153`	`'path' => '/prefix',`
`153`	`154`	`'schemes' => array('https'),`
`154`	`155`	`'methods' => array('GET'),`
`@@ -173,7 +174,7 @@ public function testClassRouteLoad()`
`173`	`174`	`;`
`174`	`175`
`175`	`176`	`$routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass');`
`176`		`- $route = $routeCollection->get($methodRouteData['name']);`
	`177`	`+ $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);`
`177`	`178`
`178`	`179`	`$this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');`
`179`	`180`	`$this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');`