[DependencyInjection] Prevent a loop in aliases within the findDefinition method
#25364
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
c716668 to
22f3523
Compare
|
AppVeyor's failure is not related... memory on |
| while (isset($this->aliasDefinitions[$id])) { | ||
| $id = (string) $this->aliasDefinitions[$id]; | ||
|
|
||
| if (isset($seen[$id])) { | ||
| throw new ServiceCircularReferenceException($id, array_keys($seen)); |
There was a problem hiding this comment.
The message should be improved see the CheckCircularReferencePass
There was a problem hiding this comment.
Sorry was on mobile :)
This is what I mean:
if (isset($seen[$id])) {
$seen = array_slice($seen, array_search($id, $seen));
$seen[] = $id;
throw new ServiceCircularReferenceException($id, $seen);
}
$seen[$id] = $id;There was a problem hiding this comment.
I see the idea. Tho, we can't use array_slice with string keys in an array, we'll have to use 2 of them.
|
Thanks for the PR. |
|
The same loop can happen in |
Yes, but is already handled there AFAIK. |
|
I've tested the fix and it throws now a circular reference exception as expected. Thx. |
fabpot
approved these changes
Dec 7, 2017
|
Thank you @sroze. |
fabpot
added a commit
that referenced
this pull request
Dec 7, 2017
… `findDefinition` method (sroze) This PR was merged into the 3.3 branch. Discussion ---------- [DependencyInjection] Prevent a loop in aliases within the `findDefinition` method | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25338 | License | MIT | Doc PR | ø This prevents an infinite loop going when aliases reference themselves. This is based on 3.3 as the "normalized ID" changed to allow non-lowercase names. Fixing this in 2.7 would mean a merge conflict that IMO is not worth it. Commits ------- 22f3523 Prevent a loop in aliases within the `findDefinition` method
nicolas-grekas
added a commit
that referenced
this pull request
Dec 8, 2017
This PR was merged into the 3.3 branch. Discussion ---------- [DI] Fix circular-aliases message | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The missing bits in #25364 Commits ------- f1a7b07 [DI] Fix circular-aliases message
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.
This prevents an infinite loop going when aliases reference themselves. This is based on 3.3 as the "normalized ID" changed to allow non-lowercase names. Fixing this in 2.7 would mean a merge conflict that IMO is not worth it.