[DI] fix using bindings with locators of service subscribers #31541
Conversation
This file contains 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
May 19, 2019
| @@ -48,6 +48,12 @@ protected function processValue($value, $isRoot = false) | |||
| if (!$v instanceof Reference) { | |||
| throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k)); | |||
| } | |||
|
|
|||
| if (\is_int($k)) { | |||
There was a problem hiding this comment.
This fix is borrowed from 4.2.
|
|
||
| require_once __DIR__.'/../Fixtures/includes/classes.php'; | ||
|
|
||
| class ServiceLocatorTagPassTest extends TestCase |
There was a problem hiding this comment.
Test class borrowed from 4.2.
| $this->assertSame(TestDefinition1::class, \get_class($locator('bar'))); | ||
| } | ||
|
|
||
| public function testBindingsAreCopied() |
There was a problem hiding this comment.
The new test case for this fix.
nicolas-grekas
added a commit
that referenced
this pull request
May 22, 2019
…rs (nicolas-grekas) This PR was merged into the 3.4 branch. Discussion ---------- [DI] fix using bindings with locators of service subscribers | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Spotted during the workshop in Sao Paulo, with @tsantos84, @andreia and others :) Commits ------- 7146b95 [DI] fix using bindings with locators of service subscribers
stof
reviewed
May 23, 2019
| $locator->setBindings($container->getDefinition($callerId)->getBindings()); | ||
| } | ||
|
|
||
| if (!$container->hasDefinition($id = 'service_locator.'.ContainerBuilder::hash($locator))) { |
There was a problem hiding this comment.
are bindings taken into account by the hashing ? If no, that would cause issues.
There was a problem hiding this comment.
correct, hash() uses serialize() so all the state is hashed
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.
Spotted during the workshop in Sao Paulo, with @tsantos84, @andreia and others :)