[Routing] Fix resource miss

dunglas · dunglas · commit 1e00afbf0e32 · 2017-10-20T09:41:32.000+02:00
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -311,6 +311,9 @@ public function build()
                 $subCollection->addPrefix($this->prefix);
 
                 $routeCollection->addCollection($subCollection);
+                foreach ($route->resources as $resource) {
+                    $routeCollection->addResource($resource);
+                }
             }
 
             foreach ($this->resources as $resource) {
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -12,7 +12,9 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouteCollectionBuilder;
@@ -59,7 +61,18 @@ public function testImport()
         $this->assertCount(1, $addedCollection->getResources());
 
         // make sure the routes were imported into the top-level builder
+        $routeCollection = $routes->build();
         $this->assertCount(1, $routes->build());
+        $this->assertCount(1, $routeCollection->getResources());
+    }
+
+    public function testImportAddResources()
+    {
+        $routeCollectionBuilder = new RouteCollectionBuilder(new YamlFileLoader(new FileLocator(array(__DIR__.'/Fixtures/'))));
+        $routeCollectionBuilder->import('file_resource.yml');
+
+        $routeCollection = $routeCollectionBuilder->build();
+        $this->assertCount(1, $routeCollection->getResources());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,9 @@ public function build()`
`311`	`311`	`$subCollection->addPrefix($this->prefix);`
`312`	`312`
`313`	`313`	`$routeCollection->addCollection($subCollection);`
	`314`	`+ foreach ($route->resources as $resource) {`
	`315`	`+ $routeCollection->addResource($resource);`
	`316`	`+ }`
`314`	`317`	`}`
`315`	`318`
`316`	`319`	`foreach ($this->resources as $resource) {`