[DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass

nicolas-grekas · nicolas-grekas · commit 5c3ee39cfd0b · 2021-05-11T18:40:34.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
@@ -48,8 +48,10 @@ protected function processValue($value, bool $isRoot = false)
                 $configurator($conditionals, $attribute->newInstance(), $reflector);
             }
         }
-        $instanceof[$reflector->getName()] = $conditionals;
-        $value->setInstanceofConditionals($instanceof);
+        if (!isset($instanceof[$reflector->getName()]) && new ChildDefinition('') != $conditionals) {
+            $instanceof[$reflector->getName()] = $conditionals;
+            $value->setInstanceofConditionals($instanceof);
+        }
 
         return parent::processValue($value, $isRoot);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AttributeAutoconfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AttributeAutoconfigurationPassTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Attribute\AsTaggedItem;
+use Symfony\Component\DependencyInjection\Compiler\AttributeAutoconfigurationPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @requires PHP 8
+ */
+class AttributeAutoconfigurationPassTest extends TestCase
+{
+    public function testProcessAddsNoEmptyInstanceofConditionals()
+    {
+        $container = new ContainerBuilder();
+        $container->registerAttributeForAutoconfiguration(AsTaggedItem::class, static function () {});
+        $container->register('foo', \stdClass::class)
+            ->setAutoconfigured(true)
+        ;
+
+        (new AttributeAutoconfigurationPass())->process($container);
+
+        $this->assertSame([], $container->getDefinition('foo')->getInstanceofConditionals());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,10 @@ protected function processValue($value, bool $isRoot = false)`
`48`	`48`	`$configurator($conditionals, $attribute->newInstance(), $reflector);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`- $instanceof[$reflector->getName()] = $conditionals;`
`52`		`- $value->setInstanceofConditionals($instanceof);`
	`51`	`+ if (!isset($instanceof[$reflector->getName()]) && new ChildDefinition('') != $conditionals) {`
	`52`	`+ $instanceof[$reflector->getName()] = $conditionals;`
	`53`	`+ $value->setInstanceofConditionals($instanceof);`
	`54`	`+ }`
`53`	`55`
`54`	`56`	`return parent::processValue($value, $isRoot);`
`55`	`57`	`}`