[DependencyInjection] Avoid unnecessary calls to strtolower() #14643
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 15, 2015
| Q | A |
|---|---|
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #14558 |
| License | MIT |
| Doc PR | - |
0f13066 to
5eb89ff
Compare
99831fc to
a064d81
Compare
| ) { | ||
| return true; | ||
| } | ||
| if (--$i && ($id !== $lcId = strtolower($id))) { |
There was a problem hiding this comment.
the brackets around $id !== $lcId = strtolower($id) seem useless
|
I guess it would be good to have a test that ensures the bug explained by stof in #14558 (comment) is not triggered. |
a064d81 to
3d71aef
Compare
| @@ -76,6 +76,8 @@ class Container implements IntrospectableContainerInterface | |||
| protected $scopeStacks; | |||
| protected $loading = array(); | |||
|
|
|||
| private static $underscoreMap = array('_' => '', '.' => '_', '\\' => '_'); | |||
There was a problem hiding this comment.
It's faster and private. But I just made it non static, that won't make a significant difference.
3d71aef to
f405c32
Compare
| || isset($this->services[$id]) | ||
| || isset($this->aliases[$id]) | ||
| || array_key_exists($id, $this->services) | ||
| || method_exists($this, 'get'.strtr($id, $this->underscoreMap).'Service') |
There was a problem hiding this comment.
I suggest checking the methodMap before doing the replacements here (as done in get)
|
@nicolas-grekas here is what the test should do:
You can run the test against the code of #14558 to ensure it catches the issue properly. |
f405c32 to
c27f564
Compare
|
👍 |
1 similar comment
|
👍 |
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
May 28, 2015
…wer() (nicolas-grekas) This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] Avoid unnecessary calls to strtolower() | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14558 | License | MIT | Doc PR | - Commits ------- c27f564 [DependencyInjection] Avoid unnecessary calls to strtolower()
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.