[DI] configure inlined services before injecting when dumping the container #28385
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
commented
Sep 6, 2018
| $b->p2 = $c; | ||
|
|
||
| return $instance; | ||
| return $this->services['foo'] = new \c1($a, $b); |
There was a problem hiding this comment.
The effect of the fix is visible here: $b is now fully configured when it is injected, where previously its p2 property was set after the injection.
ccb6e1b to
3e3d2ea
Compare
stof
requested changes
Sep 7, 2018
| @@ -620,7 +509,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN | |||
| return $calls; | |||
| } | |||
|
|
|||
| private function addServiceProperties(Definition $definition, $variableName = 'instance') | |||
| private function addServiceProperties(Definition $definition, string $variableName = 'instance') | |||
There was a problem hiding this comment.
you should not add scalar typehints if you want to retarget it to 3.4
| } | ||
| } | ||
|
|
||
| return $hasSelfRef; |
|
it would also be great to add a test reproducing the use case of Doctrine, to ensure that such instantiation works (and I mean a functional test actually using the compiled container to instantiate the service, not a test only asserting the output of the dumper) |
3e3d2ea to
16edc03
Compare
16edc03 to
ae193cd
Compare
|
Replaced by #28388 on 3.4 (ready). |
nicolas-grekas
added a commit
that referenced
this pull request
Sep 8, 2018
… dumping the container (nicolas-grekas) This PR was merged into the 3.4 branch. Discussion ---------- [DI] configure inlined services before injecting them when dumping the container | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28304 | License | MIT | Doc PR | - #28060 introduced a change in the way inline services are dumped: these instances could end up being configured *after* being injected. This breaks e.g. using Doctrine's Configuration instances, which are expected to be fully defined before being injected into their consumers. Fixing this required a significant refactorization because I was just unable to reason with the heavily scrambled logic in place right now. The new logic is still non-trivial, but at least it's manageable, thus easier to get correct. (Replaces #28385 which is the same applied to 4.1 - should help with merges.) Commits ------- e5c5405 [DI] configure inlined services before injecting them when dumping the container
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.
#28060 introduced a change in the way inline services are dumped: these instances could end up being configured after being injected. This breaks e.g. using Doctrine's Configuration instances, which are expected to be fully defined before being injected into their consumers.
Fixing this required a significant refactorization because I was just unable to reason with the heavily scrambled logic in place right now. The new logic is still non-trivial, but at least it's manageable, thus easier to get correct.
(I'll see if I can figure out a way to remove the whitespace differences also.)
To be retargeted at 3.4 once validated.