Make sure we only build once and have one time the prefix when importing routes

sroze · sroze · commit 927a75ac3eb8 · 2018-01-15T10:37:11.000Z
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -76,11 +76,11 @@ public function import($resource, $prefix = '/', $type = null)
             foreach ($collection->getResources() as $resource) {
                 $builder->addResource($resource);
             }
-
-            // mount into this builder
-            $this->mount($prefix, $builder);
         }
 
+        // mount into this builder
+        $this->mount($prefix, $builder);
+
         return $builder;
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -335,4 +335,30 @@ public function testAutomaticRouteNamesDoNotConflict()
         // there are 2 routes (i.e. with non-conflicting names)
         $this->assertCount(3, $collection->all());
     }
+
+    public function testAddsThePrefixOnlyOnceWhenLoadingMultipleCollections()
+    {
+        $firstCollection = new RouteCollection();
+        $firstCollection->add('a', new Route('/a'));
+
+        $secondCollection = new RouteCollection();
+        $secondCollection->add('b', new Route('/b'));
+
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->any())
+            ->method('supports')
+            ->will($this->returnValue(true));
+        $loader
+            ->expects($this->any())
+            ->method('load')
+            ->will($this->returnValue(array($firstCollection, $secondCollection)));
+
+        $routeCollectionBuilder = new RouteCollectionBuilder($loader);
+        $routeCollectionBuilder->import('/directory/recurse/*', '/other/', 'glob');
+        $routes = $routeCollectionBuilder->build()->all();
+
+        $this->assertEquals(2, count($routes));
+        $this->assertEquals('/other/a', $routes['a']->getPath());
+        $this->assertEquals('/other/b', $routes['b']->getPath());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ public function import($resource, $prefix = '/', $type = null)`
`76`	`76`	`foreach ($collection->getResources() as $resource) {`
`77`	`77`	`$builder->addResource($resource);`
`78`	`78`	`}`
`79`		`-`
`80`		`- // mount into this builder`
`81`		`- $this->mount($prefix, $builder);`
`82`	`79`	`}`
`83`	`80`
	`81`	`+ // mount into this builder`
	`82`	`+ $this->mount($prefix, $builder);`
	`83`	`+`
`84`	`84`	`return $builder;`
`85`	`85`	`}`
`86`	`86`