Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 6f6915f10f94 · 2016-02-04T14:53:13.000+01:00
* 2.8:
  add files used in FileResource objects
  add files used in FileResource objects
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -259,7 +259,9 @@ public function addClassResource(\ReflectionClass $class)
         }
 
         do {
-            $this->addResource(new FileResource($class->getFileName()));
+            if (is_file($class->getFileName())) {
+                $this->addResource(new FileResource($class->getFileName()));
+            }
         } while ($class = $class->getParentClass());
 
         return $this;
diff --git a/src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/bar.xml b/src/Symfony/Component/Routing/Tests/Fixtures/bar.xml
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/file_resource.yml b/src/Symfony/Component/Routing/Tests/Fixtures/file_resource.yml
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/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())

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,9 @@ public function addClassResource(\ReflectionClass $class)`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`do {`
`262`		`- $this->addResource(new FileResource($class->getFileName()));`
	`262`	`+ if (is_file($class->getFileName())) {`
	`263`	`+ $this->addResource(new FileResource($class->getFileName()));`
	`264`	`+ }`
`263`	`265`	`} while ($class = $class->getParentClass());`
`264`	`266`
`265`	`267`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ public function supports($resource, $type = null)`
`87`	`87`	`private function addClassResource(\ReflectionClass $class, RouteCollection $collection)`
`88`	`88`	`{`
`89`	`89`	`do {`
`90`		`- $collection->addResource(new FileResource($class->getFileName()));`
	`90`	`+ if (is_file($class->getFileName())) {`
	`91`	`+ $collection->addResource(new FileResource($class->getFileName()));`
	`92`	`+ }`
`91`	`93`	`} while ($class = $class->getParentClass());`
`92`	`94`	`}`
`93`	`95`	`}`