Merge branch '6.1' into 6.2

derrabus · derrabus · commit f57bcb68c603 · 2022-12-07T00:35:51.000+01:00
* 6.1: Revert "bug #48027 [DependencyInjection] Don't autoconfigure tag when it's already set with attributes (nicolas-grekas)"
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -126,7 +126,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 foreach ($instanceofTags[$i] as $k => $v) {
                     if (null === $definition->getDecoratedService() || \in_array($k, $tagsToKeep, true)) {
                         foreach ($v as $v) {
-                            if ($definition->hasTag($k) && (!$v || \in_array($v, $definition->getTag($k)))) {
+                            if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
                                 continue;
                             }
                             $definition->addTag($k, $v);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -849,7 +849,6 @@ static function (ChildDefinition $definition, CustomAutoconfiguration $attribute
                 $definition->addTag('app.custom_tag', get_object_vars($attribute) + ['class' => $reflector->getName()]);
             }
         );
-        $container->registerForAutoconfiguration(TaggedService1::class)->addTag('app.custom_tag');
 
         $container->register('one', TaggedService1::class)
             ->setPublic(true)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi`
`126`	`126`	`foreach ($instanceofTags[$i] as $k => $v) {`
`127`	`127`	`if (null === $definition->getDecoratedService() \|\| \in_array($k, $tagsToKeep, true)) {`
`128`	`128`	`foreach ($v as $v) {`
`129`		`- if ($definition->hasTag($k) && (!$v \|\| \in_array($v, $definition->getTag($k)))) {`
	`129`	`+ if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {`
`130`	`130`	`continue;`
`131`	`131`	`}`
`132`	`132`	`$definition->addTag($k, $v);`
Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,6 @@ static function (ChildDefinition $definition, CustomAutoconfiguration $attribute`
`849`	`849`	`$definition->addTag('app.custom_tag', get_object_vars($attribute) + ['class' => $reflector->getName()]);`
`850`	`850`	`}`
`851`	`851`	`);`
`852`		`- $container->registerForAutoconfiguration(TaggedService1::class)->addTag('app.custom_tag');`
`853`	`852`
`854`	`853`	`$container->register('one', TaggedService1::class)`
`855`	`854`	`->setPublic(true)`