[DI] Fix invalid callables dumped for ArgumentInterface objects #22581
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
nicolas-grekas
changed the title
nicolas-grekas
force-pushed
the
di-fix-vars
branch
from
6b19730 to
e42a23d
Compare
|
Diff best reviewed ignoring whitespaces: https://github.com/symfony/symfony/pull/22581/files?w=1 |
stof
requested changes
Apr 29, 2017
| } elseif ($value instanceof ServiceClosureArgument) { | ||
| $value = $value->getValues()[0]; | ||
| $code = $this->dumpValue($value, $interpolate); | ||
| } elseif ($scope = $value instanceof ArgumentInterface) { |
There was a problem hiding this comment.
should just be if as the previous if returns
| $value = $value->getValues()[0]; | ||
| $code = $this->dumpValue($value, $interpolate); | ||
| } elseif ($scope = $value instanceof ArgumentInterface) { | ||
| $scope = array($this->definitionVariables, $this->referenceVariables, $this->variableCount); |
There was a problem hiding this comment.
Reusing the same variable to store a boolean or an array is harder to follow. Can't we put the try/finally inside this if instead, which will allow to only store an array in $scope ?
There was a problem hiding this comment.
fixed, PR should be OK
nicolas-grekas
force-pushed
the
di-fix-vars
branch
from
e42a23d to
ff825e9
Compare
nicolas-grekas
force-pushed
the
di-fix-vars
branch
from
ff825e9 to
f81c577
Compare
stof
approved these changes
Apr 30, 2017
|
Thank you @iltar. |
nicolas-grekas
added a commit
that referenced
this pull request
Apr 30, 2017
…jects (nicolas-grekas, iltar) This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix invalid callables dumped for ArgumentInterface objects | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Follow up of #22511, from @iltar: > Currently, when having a service definition which has more than 1 usage of that service, it will put the argument in `$a` for example. By doing so, it will also use `$a` in the callable of the `ServiceLocator`, which result in an undefined variable `$a`. > I managed to trigger this with the translator service, where I have my own loader, that I add for NL and EN, causing 2 method calls to turn the direct getter into a variable. I've added 2 test cases, 1 with only 1 method call and 1 with 2 method calls. Commits ------- f81c577 [DI] Test references inside ServiceLocator are not inlined 8783602 [DI] Fix invalid callables dumped for ArgumentInterface objects
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.
Follow up of #22511, from @iltar: