symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+39Lines changed: 39 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+39Lines changed: 39 additions & 0 deletions
@@ -1267,6 +1267,7 @@ 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')
 
@@ -278,6 +278,45 @@ public function testLockMergeConfigs()
         );
     }
 
+    public function testMessengerMergeConfigsTransportOptions()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'messenger' => [
+                    'transports' => [
+                        'async' => [
+                            'dsn' => 'foo',
+                            'options' => [
+                                'auto_setup' => true,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'messenger' => [
+                    'transports' => [
+                        'async' => [
+                            'options' => [
+                                'wait_time' => 20,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertEquals(
+            [
+                'auto_setup' => true,
+                'wait_time' => 20,
+            ],
+            $config['messenger']['transports']['async']['options']
+        );
+    }
+
     public function testItShowANiceMessageIfTwoMessengerBusesAreConfiguredButNoDefaultBus()
     {
         $expectedMessage = 'You must specify the "default_bus" if you define more than one bus.';