[Config][Routing] Fix delegating to PSR-4 loader from subdirectory #47953
Conversation
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
Member
derrabus
commented
Oct 22, 2022
| Q | A |
|---|---|
| Branch? | 6.2 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Tickets | #47943 (comment) |
| License | MIT |
| Doc PR | N/A |
0f81d7a to
14b9197
Compare
14b9197 to
ccab500
Compare
fabpot
approved these changes
Oct 23, 2022
| private function loadFromDirectory(string $directory, string $psr4Prefix): RouteCollection | ||
| { | ||
| $collection = new RouteCollection(); | ||
| $collection->addResource(new DirectoryResource($directory, '/\.php$/')); |
| private function loadFromDirectory(string $directory, string $psr4Prefix): RouteCollection | ||
| { | ||
| $collection = new RouteCollection(); | ||
| $collection->addResource(new DirectoryResource($directory, '/\.php$/')); | ||
| $files = iterator_to_array(new \RecursiveIteratorIterator( |
There was a problem hiding this comment.
I've copy/pasted the logic from the annotation directory loader to keep the same file order. If not, the routes won't be registered in the same order and that could be a BC break.
I haven't shared the logic between the classes as I supposed that we will deprecate the annotation loader soon enough.
ccab500 to
c1f0ccb
Compare
|
Thank you @derrabus. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.