[DependencyInjection] Fix PriorityTaggedServiceTrait when tag attributes are not a list

GromNaN · GromNaN · commit 5a4a03640bfe · 2025-12-07T22:12:23.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -81,6 +81,7 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
                 $phpAttributes = [];
             }
 
+            $attributes = array_values($attributes);
             for ($i = 0; $i < \count($attributes); ++$i) {
                 if (!($attribute = $attributes[$i]) && $phpAttributes) {
                     array_splice($attributes, $i--, 1, $phpAttributes);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
@@ -449,6 +449,21 @@ public function testMultiTagsWithMixedAttributesAndNonStaticDefault()
         $this->assertArrayHasKey('foo', $services);
         $this->assertArrayHasKey('default', $services);
     }
+
+    public function testTagAttributesAreNotAList()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service1')->setTags([
+            'my_custom_tag' => [1 => ['attributes' => 'not_a_list']],
+        ]);
+
+        $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
+
+        $expected = [
+            new Reference('service1'),
+        ];
+        $this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container));
+    }
 }
 
 class PriorityTaggedServiceTraitImplementation

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ private function findAndSortTaggedServices(string\|TaggedIteratorArgument $tagNam`
`81`	`81`	`$phpAttributes = [];`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ $attributes = array_values($attributes);`
`84`	`85`	`for ($i = 0; $i < \count($attributes); ++$i) {`
`85`	`86`	`if (!($attribute = $attributes[$i]) && $phpAttributes) {`
`86`	`87`	`array_splice($attributes, $i--, 1, $phpAttributes);`