Skip to content

[Config] Fix FileResource usages #17684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Config] Fix FileResource usages #17684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ public function addClassResource(\ReflectionClass $class)
}

do {
$this->addResource(new FileResource($class->getFileName()));
if (file_exists($class->getFileName())) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one can be applied to 2.3 but I'd like a review of this PR before

$this->addResource(new FileResource($class->getFileName()));
}
} while ($class = $class->getParentClass());

return $this;
Expand Down
4 changes: 3 additions & 1 deletion src/Symfony/Component/Routing/Loader/ObjectRouteLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (file_exists($class->getFileName())) {
$collection->addResource(new FileResource($class->getFileName()));
}
} while ($class = $class->getParentClass());
}
}
Empty file added src/Symfony/Component/Routing/Tests/Fixtures/bar.xml
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function testLoadCallsServiceAndReturnsCollection()
$collection->add('foo', new Route('/foo'));

// create some callable object
$service = $this->getMockBuilder('stdClass')
$service = $this->getMockBuilder(__CLASS__)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stdClass has not parent class, let's take __CLASS__, which has

->setMethods(array('loadRoutes'))
->getMock();
$service->expects($this->once())
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/foo.xml'));

$resolvedLoader
->expects($this->once())
Expand Down