Ensure routes are not overwritten if have the same name

sroze · sroze · commit a4c836c0575a · 2017-11-28T05:14:00.000Z
Add the `addNamePrefix` method to the PHP trait
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
@@ -124,4 +124,18 @@ final public function controller($controller)
 
         return $this;
     }
+
+    /**
+     * Add a prefix to the name of all the routes within the collection.
+     *
+     * @param string $prefix
+     *
+     * @return $this
+     */
+    final public function addNamePrefix(string $prefix)
+    {
+        $this->route->addNamePrefix($prefix);
+
+        return $this;
+    }
 }
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -160,10 +160,13 @@ public function addPrefix($prefix, array $defaults = array(), array $requirement
      */
     public function addNamePrefix(string $prefix)
     {
+        $prefixedRoutes = array();
+
         foreach ($this->routes as $name => $route) {
-            $this->routes[$prefix.$name] = $route;
-            unset($this->routes[$name]);
+            $prefixedRoutes[$prefix.$name] = $route;
         }
+
+        $this->routes = $prefixedRoutes;
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -118,7 +118,7 @@ public function testAddDefaultsAndRequirementsAndOptions()
         $collection->add('foo', new Route('/{placeholder}'));
         $collection1 = new RouteCollection();
         $collection1->add('bar', new Route('/{placeholder}',
-                array('_controller' => 'fixed', 'placeholder' => 'default'), array('placeholder' => '.+'), array('option' => 'value'))
+            array('_controller' => 'fixed', 'placeholder' => 'default'), array('placeholder' => '.+'), array('option' => 'value'))
         );
         $collection->addCollection($collection1);
 
@@ -308,10 +308,12 @@ public function testAddNamePrefix()
         $collection = new RouteCollection();
         $collection->add('foo', $foo = new Route('/foo'));
         $collection->add('bar', $bar = new Route('/bar'));
+        $collection->add('api_foo', $apiFoo = new Route('/api/foo'));
         $collection->addNamePrefix('api_');
 
         $this->assertEquals($foo, $collection->get('api_foo'));
         $this->assertEquals($bar, $collection->get('api_bar'));
+        $this->assertEquals($apiFoo, $collection->get('api_api_foo'));
         $this->assertNull($collection->get('foo'));
         $this->assertNull($collection->get('bar'));
     }

Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,13 @@ public function addPrefix($prefix, array $defaults = array(), array $requirement`
`160`	`160`	`*/`
`161`	`161`	`public function addNamePrefix(string $prefix)`
`162`	`162`	`{`
	`163`	`+ $prefixedRoutes = array();`
	`164`	`+`
`163`	`165`	`foreach ($this->routes as $name => $route) {`
`164`		`- $this->routes[$prefix.$name] = $route;`
`165`		`- unset($this->routes[$name]);`
	`166`	`+ $prefixedRoutes[$prefix.$name] = $route;`
`166`	`167`	`}`
	`168`	`+`
	`169`	`+ $this->routes = $prefixedRoutes;`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`/**`