minor silexphp#1207 changed auto-generated route names when there is …

…a conflict (fabpot) This PR was merged into the 2.0.x-dev branch. Discussion ---------- changed auto-generated route names when there is a conflict Commits ------- 43aee48 changed auto-generated route names when there is a conflict
fabpot · Aug 3, 2015 · f7b25a2 · f7b25a2
2 parents ad64fad + 43aee48
commit f7b25a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Silex/ControllerCollection.php b/src/Silex/ControllerCollection.php
@@ -206,8 +206,9 @@ private function doFlush($prefix, RouteCollection $routes)
                 $controller->getRoute()->setPath($prefix.$controller->getRoute()->getPath());
                 if (!$name = $controller->getRouteName()) {
                     $name = $controller->generateRouteName('');
+                    $i = 0;
                     while ($routes->get($name)) {
-                        $name .= '_';
+                        $name = $controller->generateRouteName('').'_'.++$i;
                     }
                     $controller->bind($name);
                 }

diff --git a/tests/Silex/Tests/ControllerCollectionTest.php b/tests/Silex/Tests/ControllerCollectionTest.php
@@ -71,7 +71,7 @@ public function testConflictingRouteNames()
         $mountedRootController = $controllers->match('/', function () {});
 
         $mainRootController = new Controller(new Route('/'));
-        $mainRootController->bind($mainRootController->generateRouteName('main_'));
+        $mainRootController->bind($mainRootController->generateRouteName('main_1'));
 
         $controllers->flush();
 
@@ -84,11 +84,12 @@ public function testUniqueGeneratedRouteNames()
 
         $controllers->match('/a-a', function () {});
         $controllers->match('/a_a', function () {});
+        $controllers->match('/a/a', function () {});
 
         $routes = $controllers->flush();
 
-        $this->assertCount(2, $routes->all());
-        $this->assertEquals(array('_a_a', '_a_a_'), array_keys($routes->all()));
+        $this->assertCount(3, $routes->all());
+        $this->assertEquals(array('_a_a', '_a_a_1', '_a_a_2'), array_keys($routes->all()));
     }
 
     public function testUniqueGeneratedRouteNamesAmongMounts()
@@ -104,7 +105,7 @@ public function testUniqueGeneratedRouteNamesAmongMounts()
         $routes = $controllers->flush();
 
         $this->assertCount(2, $routes->all());
-        $this->assertEquals(array('_root_a_leaf', '_root_a_leaf_'), array_keys($routes->all()));
+        $this->assertEquals(array('_root_a_leaf', '_root_a_leaf_1'), array_keys($routes->all()));
     }
 
     public function testUniqueGeneratedRouteNamesAmongNestedMounts()
@@ -123,7 +124,7 @@ public function testUniqueGeneratedRouteNamesAmongNestedMounts()
         $routes = $controllers->flush();
 
         $this->assertCount(2, $routes->all());
-        $this->assertEquals(array('_root_a_tree_leaf', '_root_a_tree_leaf_'), array_keys($routes->all()));
+        $this->assertEquals(array('_root_a_tree_leaf', '_root_a_tree_leaf_1'), array_keys($routes->all()));
     }
 
     public function testAssert()