Fixing a bug with knowing which keys should be auto-generated

symfony · weaverryan · Sep 9, 2015 · Sep 9, 2015 · Sep 12, 2015 · Sep 13, 2015
commit 97b1eea7f5e8b0146cfa1dd0c2156c693bdfd603
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/RouteCollectionBuilder.php b/src/Symfony/Bundle/FrameworkBundle/Routing/RouteCollectionBuilder.php
@@ -93,14 +93,7 @@ public function add($path, $controller, $name = null)
     {
         $route = new Route($path);
         $route->setDefault('_controller', $controller);
-
-        if (null === $name) {
-            // un-named routes have integer keys, are named later
-            $this->routes[] = $route;
-        } else {
-            // case the $name into a string, to make sure a number is a string
-            $this->routes[(string)$name] = $route;
-        }
+        $this->addRoute($route, $name);
 
         return $route;
     }
@@ -141,7 +134,7 @@ public function addRouteCollection(RouteCollection $collection)
         // create a builder from the RouteCollection
         $builder = new self($this->loader);
         foreach ($collection->all() as $name => $route)
8000
 {
-            $builder->routes[(string) $name] = $route;
+            $builder->addRoute($route, $name);
         }
 
         foreach ($collection->getResources() as $resource) {
@@ -153,6 +146,25 @@ public function addRouteCollection(RouteCollection $collection)
         return $builder;
     }
 
+    /**
+     * Adds a Route object to the builder.
+     *
+     * @param Route       $route
+     * @param string|null $name
+     * @return $this
+     */
+    public function addRoute(Route $route, $name = null)
+    {
+        if (null === $name) {
+            // used as a flag to know which routes will need a name later
+            $name = '_unnamed_route_'.spl_object_hash($route);
+        }
+
+        $this->routes[$name] = $route;
+
+        return $this;
+    }
+
     /**
      * Sets a prefix (e.g. /admin) to be used with all embedded routes.
      *
@@ -316,8 +328,8 @@ public function build()
 
         foreach ($this->routes as $name => $route) {
             if ($route instanceof Route) {
-                // auto-generate the route name if it is just an index key
-                if (is_int($name)) {
+                // auto-generate the route name if it's been marked
+                if ('_unnamed_route_' === substr($name, 0, 15)) {
                     $name = $this->generateRouteName($route);
                 }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouteCollectionBuilderTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouteCollectionBuilderTest.php
@@ -137,11 +137,15 @@ public function testFlushSetsRouteNames()
         $collectionBuilder->add('/blogs', 'AppBundle:Blog:list')
             ->setMethods('GET');
 
+        // integer route names are allowed - they don't confuse things
+        $collectionBuilder->add('/products', 'AppBundle:Product:list', 100);
+
         $actualCollection = $collectionBuilder->build();
         $actualRouteNames = array_keys($actualCollection->all());
         $this->assertEquals(array(
             'admin_dashboard',
             'GET_blogs',
+            '100'
         ), $actualRouteNames);
     }