[Routing] Fix name-prefixing when using PHP DSL

nicolas-grekas · nicolas-grekas · commit 0053eeefcf92 · 2018-03-19T12:40:52.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
@@ -40,8 +40,14 @@ public function __destruct()
      *
      * @return $this
      */
-    final public function prefix($prefix)
+    final public function prefix($prefix, string $namePrefix = '')
     {
+        if ('' !== $namePrefix) {
+            $this->route->addNamePrefix($namePrefix);
+        }
+        if (!$prefix) {
+            return $this;
+        }
         if (!\is_array($prefix)) {
             $this->route->addPrefix($prefix);
         } else {
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
@@ -124,14 +124,4 @@ final public function controller($controller)
 
         return $this;
     }
-
-    /**
-     * Adds a prefix to the name of all the routes within the collection.
-     */
-    final public function addNamePrefix(string $prefix): self
-    {
-        $this->route->addNamePrefix($prefix);
-
-        return $this;
-    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php b/src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
@@ -15,6 +15,9 @@
         ->prefix('/sub')
         ->requirements(array('id' => '\d+'));
 
+    $routes->import('php_dsl_sub.php')
+        ->prefix('/zub', 'z_');
+
     $routes->add('ouf', '/ouf')
         ->schemes(array('https'))
         ->methods(array('GET'))
diff --git a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -106,6 +106,8 @@ public function testRoutingConfigurator()
             ->setHost('host')
             ->setRequirements(array('id' => '\d+'))
         );
+        $expectedCollection->add('z_c_bar', new Route('/zub/pub/bar'));
+        $expectedCollection->add('z_c_pub_buz', (new Route('/zub/pub/buz'))->setHost('host'));
         $expectedCollection->add('ouf', (new Route('/ouf'))
             ->setSchemes(array('https'))
             ->setMethods(array('GET'))

Original file line number	Diff line number	Diff line change
`@@ -124,14 +124,4 @@ final public function controller($controller)`
`124`	`124`
`125`	`125`	`return $this;`
`126`	`126`	`}`
`127`		`-`
`128`		`- /**`
`129`		`- * Adds a prefix to the name of all the routes within the collection.`
`130`		`- */`
`131`		`- final public function addNamePrefix(string $prefix): self`
`132`		`- {`
`133`		`- $this->route->addNamePrefix($prefix);`
`134`		`-`
`135`		`- return $this;`
`136`		`- }`
`137`	`127`	`}`