[DI] Fix inlining conflict by restricting IteratorArgument to Reference[] #22496
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
518b1be to
1991256
Compare
nicolas-grekas
commented
Apr 21, 2017
| @@ -683,16 +684,19 @@ private function addService($id, Definition $definition) | |||
| $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", $this->export($definition->getDeprecationMessage($id))); | |||
| } | |||
|
|
|||
| $inlinedDefinitions = $this->getInlinedDefinitions($definition); | |||
There was a problem hiding this comment.
this replaces many calls to getInlinedDefinitions by a single one
nicolas-grekas
commented
Apr 21, 2017
| @@ -1332,8 +1336,6 @@ private function getDefinitionsFromArguments(array $arguments) | |||
| foreach ($arguments as $argument) { | |||
| if (is_array($argument)) { | |||
| $definitions = array_merge($definitions, $this->getDefinitionsFromArguments($argument)); | |||
| } elseif ($argument instanceof ArgumentInterface) { | |||
| $definitions = array_merge($definitions, $this->getDefinitionsFromArguments($argument->getValues())); | |||
There was a problem hiding this comment.
this is a bug, silent for now because we don't have inline definitions in $argument->getValues(), but still a logical mistake
nicolas-grekas
commented
Apr 21, 2017
| @@ -1452,6 +1454,9 @@ private function dumpValue($value, $interpolate = true) | |||
| if ($value->getMethodCalls()) { | |||
| throw new RuntimeException('Cannot dump definitions which have method calls.'); | |||
| } | |||
| if ($value->getProperties()) { | |||
There was a problem hiding this comment.
should be done on 2.7 also
There was a problem hiding this comment.
then please split it in a separate PR
stof
reviewed
Apr 21, 2017
| @@ -1452,6 +1454,9 @@ private function dumpValue($value, $interpolate = true) | |||
| if ($value->getMethodCalls()) { | |||
| throw new RuntimeException('Cannot dump definitions which have method calls.'); | |||
| } | |||
| if ($value->getProperties()) { | |||
There was a problem hiding this comment.
then please split it in a separate PR
| } | ||
|
|
||
| return new IteratorArgument($this->resolveServices($argument, $file, $isParameter)); | ||
| try { | ||
| return new IteratorArgument($this->resolveServices($argument, $file, $isParameter)); |
There was a problem hiding this comment.
IMO, resolveServices should be outside the try/catch, so that we don't replace its exceptions by mistake
There was a problem hiding this comment.
good idea, done (also for the Xml loader, just in case)
15f9711 to
a67c3d7
Compare
a67c3d7 to
4d3dce1
Compare
chalasr
approved these changes
Apr 21, 2017
| try { | ||
| $arguments[$key] = new IteratorArgument($arg); | ||
| } catch (InvalidArgumentException $e) { | ||
| throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="iterator" only accepts collections of type="service" references.', $name)); |
There was a problem hiding this comment.
It's an xml tag, eg Tag "<argument>" ... or Tag "<property>" ...
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Apr 23, 2017
… to Reference[] (nicolas-grekas) This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix inlining conflict by restricting IteratorArgument to Reference[] | 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 | - `Reference` found in `ArgumentInterface::getValue()` are currently not inlined. While trying to do so (hint: I failed), I noticed that the current code is broken for `IteratorArgument` which can contain anonymous `Definition` for now, which are then not inlined correctly. This PR restricts `IteratorArgument` to arrays of `Reference`, and improves a few related things found while doing it. (fabbot failure is false positive) Commits ------- 4d3dce1 [DI] Fix inlining conflict by restricting IteratorArgument to Reference[]
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.
Referencefound inArgumentInterface::getValue()are currently not inlined.While trying to do so (hint: I failed), I noticed that the current code is broken for
IteratorArgumentwhich can contain anonymousDefinitionfor now, which are then not inlined correctly.This PR restricts
IteratorArgumentto arrays ofReference, and improves a few related things found while doing it.(fabbot failure is false positive)