-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[DependencyInjection] [Routing] [Config] Recursive directory loading #14700
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
fabpot
merged 2 commits into
symfony:2.8
from
nicolas-grekas:issue-11045-directory-loader
Jun 5, 2015
Merged
[DependencyInjection] [Routing] [Config] Recursive directory loading #14700
fabpot
merged 2 commits into
symfony:2.8
from
nicolas-grekas:issue-11045-directory-loader
Jun 5, 2015
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
nicolas-grekas
commented
May 20, 2015
Q | A |
---|---|
Bug fix? | no |
New feature? | yes |
BC breaks? | no |
Deprecations? | no |
Tests pass? | yes |
Fixed tickets | #13246, #11045, #11059 |
License | MIT |
Doc PR | - |
a94f17d
to
5232ff0
Compare
The changelog updates are missing |
@nicolas-grekas could you also have a look at the test failure in the TwigBundle tests ? |
return true; | ||
} | ||
|
||
return null === $type && '/' === substr($resource, -1); |
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.
- return null === $type && '/' === substr($resource, -1);
+ return null === $type && is_string($resource) && '/' === substr($resource, -1);
will solve the failing test reported by Travis ($resource
could be a Closure).
5232ff0
to
811853d
Compare
Comments addressed |
Issue symfony#11045 For now, the Routing DirectoryLoader requires the type `directory` to be specified so it does not conflict with `AnnotationDirectoryLoader`. However, this could be refactored.
811853d
to
60b1c5b
Compare
ping @symfony/deciders |
:+1 |
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Jun 5, 2015
…ectory loading (lavoiesl, nicolas-grekas) This PR was merged into the 2.8 branch. Discussion ---------- [DependencyInjection] [Routing] [Config] Recursive directory loading | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13246, #11045, #11059 | License | MIT | Doc PR | - Commits ------- 60b1c5b Added CHANGELOG entries, cleanups 73f0ee2 [DI][Routing] recursive directory loading
Merged
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.