8000 bug #41407 [DependencyInjection] keep container.service_subscriber ta… · symfony/symfony@519d348 · GitHub
[go: up one dir, main page]
Skip to content

Commit 519d348

Browse files
nicolas-grekasnicolas-grekas
committed
bug #41407 [DependencyInjection] keep container.service_subscriber tag on the decorated definition (xabbuh)
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] keep container.service_subscriber tag on the decorated definition | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- b917faf keep container.service_subscriber tag on the decorated definition
2 parents 42e4736 + b917faf commit 519d348

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ public function process(ContainerBuilder $container)
8282
$decoratingTags = $decoratingDefinition->getTags();
8383
$resetTags = [];
8484

85-
if (isset($decoratingTags['container.service_locator'])) {
86-
// container.service_locator has special logic and it must not be transferred out to decorators
87-
$resetTags = ['container.service_locator' => $decoratingTags['container.service_locator']];
88-
unset($decoratingTags['container.service_locator']);
85+
// container.service_locator and container.service_subscriber have special logic and they must not be transferred out to decorators
86+
foreach (['container.service_locator', 'container.service_subscriber'] as $containerTag) {
87+
if (isset($decoratingTags[$containerTag])) {
88+
$resetTags[$containerTag] = $decoratingTags[$containerTag];
89+
unset($decoratingTags[$containerTag]);
90+
}
8991
}
9092

9193
$definition->setTags(array_merge($decoratingTags, $definition->getTags()));

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,25 @@ public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
243243
$this->assertEquals([ 8000 9;bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
244244
}
245245

246+
public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
247+
{
248+
$container = new ContainerBuilder();
249+
$container
250+
->register('foo')
251+
->setTags(['container.service_subscriber' => [], 'bar' => ['attr' => 'baz']])
252+
;
253+
$container
254+
->register('baz')
255+
->setTags(['foobar' => ['attr' => 'bar']])
256+
->setDecoratedService('foo')
257+
;
258+
259+
$this->process($container);
260+
261+
$this->assertEquals(['container.service_subscriber' =& 6546 gt; []], $container->getDefinition('baz.inner')->getTags());
262+
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
263+
}
264+
246265
protected function process(ContainerBuilder $container)
247266
{
248267
$repeatedPass = new DecoratorServicePass();

0 commit comments

Comments
 (0)
0