8000 Merge branch '2.8' into 3.0 · symfony/symfony@6f6915f · GitHub
[go: up one dir, main page]
Skip to content

Commit 6f6915f

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: add files used in FileResource objects add files used in FileResource objects
2 parents 9617b77 + 1a8ee4f commit 6f6915f

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ public function addClassResource(\ReflectionClass $class)
259259
}
260260

261261
do {
262-
$this->addResource(new FileResource($class->getFileName()));
262+
if (is_file($class->getFileName())) {
263+
$this->addResource(new FileResource($class->getFileName()));
264+
}
263265
} while ($class = $class->getParentClass());
264266

265267
return $this;

‎src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ public function supports($resource, $type = null)
8787
private function addClassResource(\ReflectionClass $class, RouteCollection $collection)
8888
{
8989
do {
90-
$collection->addResource(new FileResource($class->getFileName()));
90+
if (is_file($class->getFileName())) {
91+
$collection->addResource(new FileResource($class->getFileName()));
92+
}
9193
} while ($class = $class->getParentClass());
9294
}
9395
}

‎src/Symfony/Component/Routing/Tests/Fixtures/bar.xml

Whitespace-only changes.

‎src/Symfony/Component/Routing/Tests/Fixtures/file_resource.yml

Whitespace-only changes.

‎src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,8 @@ public function testLoadCallsServiceAndReturnsCollection()
2525
$collection = new RouteCollection();
2626
$collection->add('foo', new Route('/foo'));
2727

28-
// create some callable object
29-
$service = $this->getMockBuilder('stdClass')
30-
->setMethods(array('loadRoutes'))
31-
->getMock();
32-
$service->expects($this->once())
33-
->method('loadRoutes')
34-
->with($loader)
35-
->will($this->returnValue($collection));
36-
3728
$loader->loaderMap = array(
38-
'my_route_provider_service' => $service,
29+
'my_route_provider_service' => new RouteService($collection),
3930
);
4031

4132
$actualRoutes = $loader->load(
@@ -114,3 +105,18 @@ protected function getServiceObject($id)
114105
return isset($this->loaderMap[$id]) ? $this->loaderMap[$id] : null;
115106
}
116107
}
108+
109+
class RouteService
110+
{
111+
private $collection;
112+
113+
public function __construct($collection)
114+
{
115+
$this->collection = $collection;
116+
}
117+
118+
public function loadRoutes()
119+
{
120+
return $this->collection;
121+
}
122+
}

‎src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testImport()
3030
$originalRoute = new Route('/foo/path');
3131
$expectedCollection = new RouteCollection();
3232
$expectedCollection->add('one_test_route', $originalRoute);
33-
$expectedCollection->addResource(new FileResource('file_resource.yml'));
33+
$expectedCollection->addResource(new FileResource(__DIR__.'/Fixtures/file_resource.yml'));
3434

3535
$resolvedLoader
3636
->expects($this->once())

0 commit comments

Comments
 (0)
0