[DependencyInjection] Ensure Definition::getTags() contains a list of attributes for each tag

GromNaN · GromNaN · commit 5eda50735d69 · 2025-12-07T21:04:26.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -422,7 +422,7 @@ public function isAutoconfigured(): bool
      */
     public function setTags(array $tags): static
     {
-        $this->tags = $tags;
+        $this->tags = array_map(array_values(...), $tags);
 
         return $this;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -216,6 +216,19 @@ public function testSetGetConfigurator()
         $this->assertEquals('foo', $def->getConfigurator(), '->getConfigurator() returns the configurator');
     }
 
+    public function testSetTagsAreInList()
+    {
+        $def = new Definition('stdClass');
+        $def->setTags([
+            'tag1' => [5 => ['attr1' => 'value1'], 3 => []],
+            'tag2' => [1 => ['attr2' => 'value2']],
+        ]);
+        $this->assertEquals([
+            'tag1' => [['attr1' => 'value1'], []],
+            'tag2' => [['attr2' => 'value2']],
+        ], $def->getTags(), '->setTags() reindex the tags arrays');
+    }
+
     public function testClearTags()
     {
         $def = new Definition('stdClass');

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ public function isAutoconfigured(): bool`
`422`	`422`	`*/`
`423`	`423`	`public function setTags(array $tags): static`
`424`	`424`	`{`
`425`		`- $this->tags = $tags;`
	`425`	`+ $this->tags = array_map(array_values(...), $tags);`
`426`	`426`
`427`	`427`	`return $this;`
`428`	`428`	`}`