[Messenger] Messenger options were merged with numbers as keys.

svitiashchuk · svitiashchuk · commit a2eabcce22a6 · 2021-01-20T20:42:59.000+02:00
Allow named keys on right side to be merged without restriction on key-name (when useAttributeAsKey($keyName) is used).
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1267,7 +1267,6 @@ function ($a) {
                                     ->scalarNode('dsn')->end()
                                     ->scalarNode('serializer')->defaultNull()->info('Service id of a custom serializer to use.')->end()
                                     ->arrayNode('options')
-                                        ->useAttributeAsKey('option')
                                         ->normalizeKeys(false)
                                         ->defaultValue([])
                                         ->prototype('variable')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -303,6 +303,13 @@ public function testMessengerMergeConfigsTransportOptions()
                             'options' => [
                                 'wait_time' => 20,
                                 'option' => 'bar',
+                                'queue' => [
+                                    'name' => 'Queue',
+                                    'option' => 'foo',
+                                    'queue_options' => [
+                                        'option' => 'foo',
+                                    ],
+                                ],
                             ],
                         ],
                     ],
@@ -315,6 +322,13 @@ public function testMessengerMergeConfigsTransportOptions()
                 'auto_setup' => true,
                 'option' => 'bar',
                 'wait_time' => 20,
+                'queue' => [
+                    'name' => 'Queue',
+                    'option' => 'foo',
+                    'queue_options' => [
+                        'option' => 'foo',
+                    ],
+                ],
             ],
             $config['messenger']['transports']['async']['options']
         );
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -304,9 +304,10 @@ protected function mergeValues($leftSide, $rightSide)
             return $rightSide;
         }
 
+        $isAssoc = array_keys($rightSide) !== range(0, \count($rightSide) - 1);
         foreach ($rightSide as $k => $v) {
-            // prototype, and key is irrelevant, append the element
-            if (null === $this->keyAttribute) {
+            // prototype, and key is irrelevant there are no named keys, append the element
+            if (null === $this->keyAttribute && !$isAssoc) {
                 $leftSide[] = $v;
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -304,9 +304,10 @@ protected function mergeValues($leftSide, $rightSide)`
`304`	`304`	`return $rightSide;`
`305`	`305`	`}`
`306`	`306`
	`307`	`+ $isAssoc = array_keys($rightSide) !== range(0, \count($rightSide) - 1);`
`307`	`308`	`foreach ($rightSide as $k => $v) {`
`308`		`- // prototype, and key is irrelevant, append the element`
`309`		`- if (null === $this->keyAttribute) {`
	`309`	`+ // prototype, and key is irrelevant there are no named keys, append the element`
	`310`	`+ if (null === $this->keyAttribute && !$isAssoc) {`
`310`	`311`	`$leftSide[] = $v;`
`311`	`312`	`continue;`
`312`	`313`	`}`