symfony
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
-56Lines changed: 0 additions & 56 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
-56Lines changed: 0 additions & 56 deletions
diff --git a/‎src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
+52Lines changed: 52 additions & 0 deletions b/‎src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
+52Lines changed: 52 additions & 0 deletions
@@ -278,62 +278,6 @@ 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,
-                                'option' => 'foo',
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            [
-                'messenger' => [
-                    'transports' => [
-                        'async' => [
-                            'options' => [
-                                'wait_time' => 20,
-                                'option' => 'bar',
-                                'queue' => [
-                                    'name' => 'Queue',
-                                    'option' => 'foo',
-                                    'queue_options' => [
-                                        'option' => 'foo',
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
-        $this->assertSame(
-            [
-                'auto_setup' => true,
-                'option' => 'bar',
-                'wait_time' => 20,
-                'queue' => [
-                    'name' => 'Queue',
-                    'option' => 'foo',
-                    'queue_options' => [
-                        'option' => 'foo',
-                    ],
-                ],
-            ],
-            $config['messenger']['transports']['async']['options']
-        );
-    }
-
     public function testItShowANiceMessageIfTwoMessengerBusesAreConfiguredButNoDefaultBus()
     {
         $expectedMessage = 'You must specify the "default_bus" if you define more than one bus.';
 
@@ -338,4 +338,56 @@ public function getDataForKeyRemovedLeftValueOnly()
            ],
         ];
     }
+
+    /**
+     * @dataProvider getPrototypedArrayNodeDataToMerge
+     */
+    public function testPrototypedArrayNodeMerge($left, $right, $expected)
+    {
+        $node = new PrototypedArrayNode('options');
+        $node->setNormalizeKeys(false);
+        $node->setPrototype(new VariableNode('value'));
+        $node->setDefaultValue([]);
+
+        $result = $node->merge($left, $right);
+
+        self::assertSame($result, $expected);
+    }
+
+    public function getPrototypedArrayNodeDataToMerge()
+    {
+        return [
+            // data to merged is a plain array
+            [
+                ['foo', 'bar'],
+                ['foo', 'baz', 'qux'],
+                ['foo', 'bar', 'foo', 'baz', 'qux'],
+            ],
+            // data to be merged is an associative array
+            [
+                ['option1' => true, 'option2'  => 'foo',],
+                [
+                    'option2' => 'bar',
+                    'option3' => 42,
+                    'option4' => [
+                        'option41' => 'baz',
+                        'option42' => [
+                            'option423' => 'qux',
+                        ],
+                    ],
+                ],
+                [
+                    'option1' => true,
+                    'option2' => 'bar',
+                    'option3' => 42,
+                    'option4' => [
+                        'option41' => 'baz',
+                        'option42' => [
+                            'option423' => 'qux',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
 }