diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index 7659b8336e7bd..fed2916f34def 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -82,10 +82,12 @@ public function process(ContainerBuilder $container)
$decoratingTags = $decoratingDefinition->getTags();
$resetTags = [];
- if (isset($decoratingTags['container.service_locator'])) {
- // container.service_locator has special logic and it must not be transferred out to decorators
- $resetTags = ['container.service_locator' => $decoratingTags['container.service_locator']];
- unset($decoratingTags['container.service_locator']);
+ // container.service_locator and container.service_subscriber have special logic and they must not be transferred out to decorators
+ foreach (['container.service_locator', 'container.service_subscriber'] as $containerTag) {
+ if (isset($decoratingTags[$containerTag])) {
+ $resetTags[$containerTag] = $decoratingTags[$containerTag];
+ unset($decoratingTags[$containerTag]);
+ }
}
$definition->setTags(array_merge($decoratingTags, $definition->getTags()));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
index ce9a2cfafeebb..a739dda3a679a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -243,6 +243,25 @@ public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
$this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
}
+ public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
+ {
+ $container = new ContainerBuilder();
+ $container
+ ->register('foo')
+ ->setTags(['container.service_subscriber' => [], 'bar' => ['attr' => 'baz']])
+ ;
+ $container
+ ->register('baz')
+ ->setTags(['foobar' => ['attr' => 'bar']])
+ ->setDecoratedService('foo')
+ ;
+
+ $this->process($container);
+
+ $this->assertEquals(['container.service_subscriber' => []], $container->getDefinition('baz.inner')->getTags());
+ $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+ }
+
protected function process(ContainerBuilder $container)
{
$repeatedPass = new DecoratorServicePass();
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy