[DependencyInjection] fix XmlDumper when a tag contains also a 'name' property

lyrixx · lyrixx · commit 0d388427465d · 2024-03-13T17:18:00.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -134,16 +134,17 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa
         foreach ($tags as $name => $tags) {
             foreach ($tags as $attributes) {
                 $tag = $this->document->createElement('tag');
-                if (!\array_key_exists('name', $attributes)) {
-                    $tag->setAttribute('name', $name);
-                } else {
-                    $tag->appendChild($this->document->createTextNode($name));
-                }
 
                 // Check if we have recursive attributes
                 if (array_filter($attributes, \is_array(...))) {
+                    $tag->setAttribute('name', $name);
                     $this->addTagRecursiveAttributes($tag, $attributes);
                 } else {
+                    if (!\array_key_exists('name', $attributes)) {
+                        $tag->setAttribute('name', $name);
+                    } else {
+                        $tag->appendChild($this->document->createTextNode($name));
+                    }
                     foreach ($attributes as $key => $value) {
                         $tag->setAttribute($key, $value ?? '');
                     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_non_scalar_tags.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_non_scalar_tags.php
@@ -10,6 +10,7 @@
 $container
     ->register('foo', FooClass::class)
     ->addTag('foo_tag', [
+        'name' => 'attributeName',
         'foo' => 'bar',
         'bar' => [
             'foo' => 'bar',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_array_tags.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_array_tags.xml
@@ -4,6 +4,7 @@
     <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
     <service id="foo" class="Bar\FooClass">
       <tag name="foo_tag">
+        <attribute name="name">attributeName</attribute>
         <attribute name="foo">bar</attribute>
         <attribute name="bar">
           <attribute name="foo">bar</attribute>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_array_tags.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_array_tags.yml
@@ -7,4 +7,4 @@ services:
     foo:
         class: Bar\FooClass
         tags:
-            - foo_tag: { foo: bar, bar: { foo: bar, bar: foo } }
+            - foo_tag: { name: attributeName, foo: bar, bar: { foo: bar, bar: foo } }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -460,7 +460,7 @@ public function testParseServiceTagsWithArrayAttributes()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services_with_array_tags.xml');
 
-        $this->assertEquals(['foo_tag' => [['foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());
+        $this->assertEquals(['foo_tag' => [['name' => 'attributeName', 'foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());
     }
 
     public function testParseTagsWithoutNameThrowsException()

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ public function testParseServiceTagsWithArrayAttributes()`
`460`	`460`	`$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));`
`461`	`461`	`$loader->load('services_with_array_tags.xml');`
`462`	`462`
`463`		`- $this->assertEquals(['foo_tag' => [['foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());`
	`463`	`+ $this->assertEquals(['foo_tag' => [['name' => 'attributeName', 'foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`public function testParseTagsWithoutNameThrowsException()`