Merge branch '2.8' into 3.0

* 2.8: add files used in FileResource objects add files used in FileResource objects
symfony · Feb 4, 2016 · fa1e9a8 · fa1e9a8
2 parents a193ded + ae38e64
commit fa1e9a8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/Loader/ObjectRouteLoader.php b/Loader/ObjectRouteLoader.php
@@ -87,7 +87,9 @@ public function supports($resource, $type = null)
     private function addClassResource(\ReflectionClass $class, RouteCollection $collection)
     {
         do {
-            $collection->addResource(new FileResource($class->getFileName()));
+            if (is_file($class->getFileName())) {
+                $collection->addResource(new FileResource($class->getFileName()));
+            }
         } while ($class = $class->getParentClass());
     }
 }
diff --git a/Tests/Fixtures/bar.xml b/Tests/Fixtures/bar.xml
diff --git a/Tests/Fixtures/file_resource.yml b/Tests/Fixtures/file_resource.yml
diff --git a/Tests/Loader/ObjectRouteLoaderTest.php b/Tests/Loader/ObjectRouteLoaderTest.php
@@ -25,17 +25,8 @@ public function testLoadCallsServiceAndReturnsCollection()
         $collection = new RouteCollection();
         $collection->add('foo', new Route('/foo'));
 
-        // create some callable object
-        $service = $this->getMockBuilder('stdClass')
-            ->setMethods(array('loadRoutes'))
-            ->getMock();
-        $service->expects($this->once())
-            ->method('loadRoutes')
-            ->with($loader)
-            ->will($this->returnValue($collection));
-
         $loader->loaderMap = array(
-            'my_route_provider_service' => $service,
+            'my_route_provider_service' => new RouteService($collection),
         );
 
         $actualRoutes = $loader->load(
@@ -114,3 +105,18 @@ protected function getServiceObject($id)
         return isset($this->loaderMap[$id]) ? $this->loaderMap[$id] : null;
     }
 }
+
+class RouteService
+{
+    private $collection;
+
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+    }
+
+    public function loadRoutes()
+    {
+        return $this->collection;
+    }
+}
diff --git a/Tests/RouteCollectionBuilderTest.php b/Tests/RouteCollectionBuilderTest.php
@@ -30,7 +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'));
+        $expectedCollection->addResource(new FileResource(__DIR__.'/Fixtures/file_resource.yml'));
 
         $resolvedLoader
             ->expects($this->once())