-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[DI][Routing] Fix tracking of globbed resources #25989
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.
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
Merged
nicolas-grekas
merged 2 commits into
symfony:3.4
from
nicolas-grekas:glob-loader-tracking
Feb 4, 2018
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\DependencyInjection\Loader; | ||
|
|
||
| /** | ||
| * GlobFileLoader loads files from a glob pattern. | ||
| * | ||
| * @author Nicolas Grekas <p@tchwork.com> | ||
| */ | ||
| class GlobFileLoader extends FileLoader | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function load($resource, $type = null) | ||
| { | ||
| foreach ($this->glob($resource, false, $globResource) as $path => $info) { | ||
| $this->import($path); | ||
| } | ||
|
|
||
| $this->container->addResource($globResource); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function supports($resource, $type = null) | ||
| { | ||
| return 'glob' === $type; | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\DependencyInjection\Tests\Loader; | ||
|
|
||
| use PHPUnit\Framework\TestCase; | ||
| use Symfony\Component\Config\Resource\GlobResource; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Loader\GlobFileLoader; | ||
| use Symfony\Component\Config\FileLocator; | ||
|
|
||
| class GlobFileLoaderTest extends TestCase | ||
| { | ||
| public function testSupports() | ||
| { | ||
| $loader = new GlobFileLoader(new ContainerBuilder(), new FileLocator()); | ||
|
|
||
| $this->assertTrue($loader->supports('any-path', 'glob'), '->supports() returns true if the resource has the glob type'); | ||
| $this->assertFalse($loader->supports('any-path'), '->supports() returns false if the resource is not of glob type'); | ||
| } | ||
|
|
||
| public function testLoadAddsTheGlobResourceToTheContainer() | ||
| { | ||
| $loader = new GlobFileLoaderWithoutImport($container = new ContainerBuilder(), new FileLocator()); | ||
| $loader->load(__DIR__.'/../Fixtures/config/*'); | ||
|
|
||
| $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[1]); | ||
| } | ||
| } | ||
|
|
||
| class GlobFileLoaderWithoutImport extends GlobFileLoader | ||
| { | ||
| public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null) | ||
| { | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\Routing\Loader; | ||
|
|
||
| use Symfony\Component\Config\Loader\FileLoader; | ||
| use Symfony\Component\Routing\RouteCollection; | ||
|
|
||
| /** | ||
| * GlobFileLoader loads files from a glob pattern. | ||
| * | ||
| * @author Nicolas Grekas <p@tchwork.com> | ||
| */ | ||
| class GlobFileLoader extends FileLoader | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function load($resource, $type = null) | ||
| { | ||
| $collection = new RouteCollection(); | ||
|
|
||
| foreach ($this->glob($resource, false, $globResource) as $path => $info) { | ||
| $collection->addCollection($this->import($path)); | ||
| } | ||
|
|
||
| $collection->addResource($globResource); | ||
|
|
||
| return $collection; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function supports($resource, $type = null) | ||
| { | ||
| return 'glob' === $type; | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
src/Symfony/Component/Routing/Tests/Loader/GlobFileLoaderTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\Routing\Tests\Loader; | ||
|
|
||
| use PHPUnit\Framework\TestCase; | ||
| use Symfony\Component\Config\Resource\GlobResource; | ||
| use Symfony\Component\Config\FileLocator; | ||
| use Symfony\Component\Routing\Loader\GlobFileLoader; | ||
| use Symfony\Component\Routing\RouteCollection; | ||
|
|
||
| class GlobFileLoaderTest extends TestCase | ||
| { | ||
| public function testSupports() | ||
| { | ||
| $loader = new GlobFileLoader(new FileLocator()); | ||
|
|
||
| $this->assertTrue($loader->supports('any-path', 'glob'), '->supports() returns true if the resource has the glob type'); | ||
| $this->assertFalse($loader->supports('any-path'), '->supports() returns false if the resource is not of glob type'); | ||
| } | ||
|
|
||
| public function testLoadAddsTheGlobResourceToTheContainer() | ||
| { | ||
| $loader = new GlobFileLoaderWithoutImport(new FileLocator()); | ||
| $collection = $loader->load(__DIR__.'/../Fixtures/directory/*.yml'); | ||
|
|
||
| $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/directory', '/*.yml', false), $collection->getResources()[0]); | ||
| } | ||
| } | ||
|
|
||
| class GlobFileLoaderWithoutImport extends GlobFileLoader | ||
| { | ||
| public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null) | ||
| { | ||
| return new RouteCollection(); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need any of the parent class's special glob code that's in
import? I don't fully understand that code - it came from #22985 - but I know you do ;). Just double-checking.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parent extra logic is here to autodetect glob when it's not explicit. Here, it is explicit, so no need.