Removing the ability to set a prefix on a builder: that only happens …

…when you mount addBuilder was also renamed to mount
symfony · weaverryan · Sep 9, 2015 · Sep 9, 2015 · Sep 12, 2015 · Sep 13, 2015
commit fbab6d437e382b4fa18dec7d6165948c6fe256d7
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -89,16 +89,13 @@ public function add($path, $controller, $name = null)
     }
 
     /**
-     * Returns a RouteCollectionBuilder that can be configured and then added with addBuilder().
-     *
-     * @param string $prefix A prefix to apply to all routes added to this collection
+     * Returns a RouteCollectionBuilder that can be configured and then added with mount().
      *
      * @return RouteCollectionBuilder
      */
-    public function createBuilder($prefix = null)
+    public function createBuilder()
     {
         $builder = new self($this->loader);
-        $builder->setPrefix($prefix);
 
         return $builder;
     }
@@ -108,8 +105,9 @@ public function createBuilder($prefix = null)
      *
      * @param RouteCollectionBuilder $builder
      */
-    public function addBuilder(RouteCollectionBuilder $builder)
+    public function mount($prefix, RouteCollectionBuilder $builder)
     {
+        $builder->prefix = trim(trim($prefix), '/');
         $this->routes[] = $builder;
     }
 
@@ -124,7 +122,7 @@ public function addBuilder(RouteCollectionBuilder $builder)
     public function addRouteCollection(RouteCollection $collection, $prefix = null)
     {
         // create a builder from the RouteCollection
-        $builder = $this->createBuilder($prefix);
+        $builder = $this->createBuilder();
         foreach ($collection->all() as $name => $route) {
             $builder->addRoute($route, $name);
         }
@@ -133,7 +131,7 @@ public function addRouteCollection(RouteCollection $collection, $prefix = null)
             $builder->addResource($resource);
         }
 
-        $this->addBuilder($builder);
+        $this->mount($prefix, $builder);
 
         return $builder;
     }
@@ -158,20 +156,6 @@ public function addRoute(Route $route, $name = null)
         return $this;
     }
 
-    /**
-     * Sets a prefix (e.g. /admin) to be used with all embedded routes.
-     *
-     * @param string $prefix
-     *
-     * @return $this
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = trim(trim($prefix), '/');
-
-        return $this;
-    }
-
     /**
      * Sets the host on all embedded routes (unless already set).
      *

diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -239,10 +239,13 @@ public function testFlushSetsDetailsOnChildrenRoutes()
     public function testFlushPrefixesPaths($collectionPrefix, $routePath, $expectedPath)
     {
         $routes = new RouteCollectionBuilder();
-        $routes->setPrefix($collectionPrefix);
 
         $routes->add($routePath, 'someController', 'test_route');
-        $collection = $routes->build();
+
+        $outerRoutes = new RouteCollectionBuilder();
+        $outerRoutes->mount($collectionPrefix, $routes);
+
+        $collection = $outerRoutes->build();
 
         $this->assertEquals($expectedPath, $collection->get('test_route')->getPath());
     }
@@ -255,7 +258,6 @@ public function providePrefixTests()
         // normal prefix - does not matter if it's a wildcard
         $tests[] = array('/{admin}', '/foo', '/{admin}/foo');
         // shows that a prefix will always be given the starting slash
-        $tests = array();
         $tests[] = array('0', '/foo', '/0/foo');
 
         // spaces are ok, and double slahses at the end are cleaned
@@ -271,24 +273,24 @@ public function testFlushSetsPrefixedWithMultipleLevels()
 
         $routes->add('homepage', 'MainController::homepageAction', 'homepage');
 
-        $adminRoutes = $routes->createBuilder('/admin');
+        $adminRoutes = $routes->createBuilder();
         $adminRoutes->add('/dashboard', 'AdminController::dashboardAction', 'admin_dashboard');
 
         // embedded collection under /admin
-        $adminBlogRoutes = $routes->createBuilder('/blog');
+        $adminBlogRoutes = $routes->createBuilder();
         $adminBlogRoutes->add('/new', 'BlogController::newAction', 'admin_blog_new');
         // mount into admin, but before the parent collection has been mounted
-        $adminRoutes->addBuilder($adminBlogRoutes);
+        $adminRoutes->mount('/blog', $adminBlogRoutes);
 
         // now mount the /admin routes, above should all still be /blog/admin
-        $routes->addBuilder($adminRoutes);
+        $routes->mount('/admin', $adminRoutes);
         // add a route after mounting
         $adminRoutes->add('/users', 'AdminController::userAction', 'admin_users');
 
         // add another sub-collection after the mount
-        $otherAdminRoutes = $routes->createBuilder('/stats');
+        $otherAdminRoutes = $routes->createBuilder();
         $otherAdminRoutes->add('/sales', 'StatsController::indexAction', 'admin_stats_sales');
-        $adminRoutes->addBuilder($otherAdminRoutes);
+        $adminRoutes->mount('/stats', $otherAdminRoutes);
 
         // add a normal collection and see that it is also prefixed
         $importedCollection = new RouteCollection();