bug #20278 [DependencyInjection] merge tags instead of completely replacing them (xabbuh)

fabpot · fabpot · commit 7f3ce9af8335 · 2016-10-23T08:03:30.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [DependencyInjection] merge tags instead of completely replacing them | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | yes/no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20150, #20207 | License | MIT | Doc PR | In #20207, I missed the `array_merge()` call. Thus, previously set tags of the decorating service would have been discarded by the compiler pass. Commits ------- c333eb7 merge tags instead of completely replacing them
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
                 $container->setAlias($renamedId, new Alias((string) $alias, false));
             } else {
                 $decoratedDefinition = $container->getDefinition($inner);
-                $definition->setTags($decoratedDefinition->getTags(), $definition->getTags());
+                $definition->setTags(array_merge($decoratedDefinition->getTags(), $definition->getTags()));
                 $public = $decoratedDefinition->isPublic();
                 $decoratedDefinition->setPublic(false);
                 $decoratedDefinition->setTags(array());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -87,17 +87,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $container = new ContainerBuilder();
         $container
             ->register('foo')
-            ->setTags(array('name' => 'bar'))
+            ->setTags(array('bar' => array('attr' => 'baz')))
         ;
         $container
             ->register('baz')
+            ->setTags(array('foobar' => array('attr' => 'bar')))
             ->setDecoratedService('foo')
         ;
 
         $this->process($container);
 
         $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());
+        $this->assertEquals(array('bar' => array('attr' => 'baz'), 'foobar' => array('attr' => 'bar')), $container->getDefinition('baz')->getTags());
     }
 
     protected function process(ContainerBuilder $container)

Original file line number	Diff line number	Diff line change
`@@ -87,17 +87,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio`
`87`	`87`	`$container = new ContainerBuilder();`
`88`	`88`	`$container`
`89`	`89`	`->register('foo')`
`90`		`- ->setTags(array('name' => 'bar'))`
	`90`	`+ ->setTags(array('bar' => array('attr' => 'baz')))`
`91`	`91`	`;`
`92`	`92`	`$container`
`93`	`93`	`->register('baz')`
	`94`	`+ ->setTags(array('foobar' => array('attr' => 'bar')))`
`94`	`95`	`->setDecoratedService('foo')`
`95`	`96`	`;`
`96`	`97`
`97`	`98`	`$this->process($container);`
`98`	`99`
`99`	`100`	`$this->assertEmpty($container->getDefinition('baz.inner')->getTags());`
`100`		`- $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());`
	`101`	`+ $this->assertEquals(array('bar' => array('attr' => 'baz'), 'foobar' => array('attr' => 'bar')), $container->getDefinition('baz')->getTags());`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`protected function process(ContainerBuilder $container)`