bug #16361 Re-adding the ability to add a resource to the RouteCollectionBuilder (weaverryan)

fabpot · fabpot · commit b587fa3e94fd · 2015-11-05T13:57:14.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- Re-adding the ability to add a resource to the RouteCollectionBuilder | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a At the end of #15778, I removed the ability to add a resource to the RouteCollectionBuilder. But, this is needed (at least internally): if you import, the returned RouteCollection may have resources, which need to be brought forward into the new RouteCollectionBuilder (the code in `import()` to do this already exists, but is calling an undefined `addResource()` method). This adds the test with minimal code to fix. P.S. Fabien told me to remove `addResource` originally... so isn't this *kind of* his fault? Commits ------- 3b67daa Re-adding the ability to add a resource to the RouteCollectionBuilder
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Exception\FileLoaderLoadException;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\Resource\ResourceInterface;
 
 /**
  * Helps add and import routes into a RouteCollection.
@@ -35,6 +36,7 @@ class RouteCollectionBuilder
     private $options = array();
     private $schemes;
     private $methods;
+    private $resources = array();
 
     /**
      * @param LoaderInterface $loader
@@ -237,6 +239,20 @@ public function setMethods($methods)
         return $this;
     }
 
+    /**
+     * Adds a resource for this collection.
+     *
+     * @param ResourceInterface $resource
+     *
+     * @return $this
+     */
+    private function addResource(ResourceInterface $resource)
+    {
+        $this->resources[] = $resource;
+
+        return $this;
+    }
+
     /**
      * Creates the final RouteCollection and returns it.
      *
@@ -291,6 +307,10 @@ public function build()
 
                 $routeCollection->addCollection($subCollection);
             }
+
+            foreach ($this->resources as $resource) {
+                $routeCollection->addResource($resource);
+            }
         }
 
         return $routeCollection;
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Tests;
 
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouteCollectionBuilder;
@@ -29,6 +30,7 @@ public function testImport()
         $originalRoute = new Route('/foo/path');
         $expectedCollection = new RouteCollection();
         $expectedCollection->add('one_test_route', $originalRoute);
+        $expectedCollection->addResource(new FileResource('file_resource.yml'));
 
         $resolvedLoader
             ->expects($this->once())
@@ -52,6 +54,8 @@ public function testImport()
         $addedCollection = $importedRoutes->build();
         $route = $addedCollection->get('one_test_route');
         $this->assertSame($originalRoute, $route);
+        // should return file_resource.yml, which is in the original collection
+        $this->assertCount(1, $addedCollection->getResources());
     }
 
     /**
