Commitfdd2ec2

committed

[DependencyInjection] Don't ignore attributes on the actual decorator

1 parente789e08 commitfdd2ec2Copy full SHA for fdd2ec2

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi`
`87`	`87`	`$instanceofDef->setAbstract(true)->setParent($parent ?:'.abstract.instanceof.'.$id);`
`88`	`88`	`$parent ='.instanceof.'.$interface.'.'.$key.'.'.$id;`
`89`	`89`	`$container->setDefinition($parent,$instanceofDef);`
`90`		`-$instanceofTags[] =$instanceofDef->getTags();`
	`90`	`+$instanceofTags[] =[$interface,$instanceofDef->getTags()];`
`91`	`91`	`$instanceofBindings =$instanceofDef->getBindings() +$instanceofBindings;`
`92`	`92`
`93`	`93`	`foreach ($instanceofDef->getMethodCalls()as$methodCall) {`
`@@ -126,8 +126,9 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi`
`126`	`126`	`// Don't add tags to service decorators`
`127`	`127`	`$i =\count($instanceofTags);`
`128`	`128`	`while (0 <= --$i) {`
`129`		`-foreach ($instanceofTags[$i]as$k =>$v) {`
`130`		`-if (null ===$definition->getDecoratedService() \|\|\in_array($k,$tagsToKeep,true)) {`
	`129`	`+ [$interface,$tags] =$instanceofTags[$i];`
	`130`	`+foreach ($tagsas$k =>$v) {`
	`131`	`+if (null ===$definition->getDecoratedService() \|\|$interface ===$definition->getClass() \|\|\in_array($k,$tagsToKeep,true)) {`
`131`	`132`	`foreach ($vas$v) {`
`132`	`133`	`if ($definition->hasTag($k) &&\in_array($v,$definition->getTag($k))) {`
`133`	`134`	`continue;`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -318,18 +318,26 @@ public function testDecoratorsAreNotAutomaticallyTagged()`
`318`	`318`	`$decorator->setDecoratedService('decorated');`
`319`	`319`	`$decorator->setInstanceofConditionals([`
`320`	`320`	`parent::class => (newChildDefinition(''))->addTag('tag'),`
	`321`	`+self::class => (newChildDefinition(''))->addTag('other-tag'),`
`321`	`322`	`]);`
`322`	`323`	`$decorator->setAutoconfigured(true);`
`323`	`324`	`$decorator->addTag('manual');`
`324`	`325`
`325`	`326`	`$container->registerForAutoconfiguration(parent::class)`
`326`	`327`	`->addTag('tag')`
`327`	`328`	`;`
	`329`	`+$container->registerForAutoconfiguration(self::class)`
	`330`	`+ ->addTag('last-tag')`
	`331`	`+ ;`
`328`	`332`
`329`	`333`	`(newResolveInstanceofConditionalsPass())->process($container);`
`330`	`334`	`(newResolveChildDefinitionsPass())->process($container);`
`331`	`335`
`332`		`-$this->assertSame(['manual' => [[]]],$container->getDefinition('decorator')->getTags());`
	`336`	`+$this->assertSame([`
	`337`	`+'manual' => [[]],`
	`338`	`+'other-tag' => [[]],`
	`339`	`+'last-tag' => [[]],`
	`340`	`+ ],$container->getDefinition('decorator')->getTags());`
`333`	`341`	`}`
`334`	`342`
`335`	`343`	`publicfunctiontestDecoratorsKeepBehaviorDescribingTags()`

Comments

(0)