Merge branch '5.2' into 5.x

* 5.2:
  remove unneeded sprintf() call
  Fix CS
  Fix config merging in lock
  keep trailing newlines when dumping multi-line strings
  disable error bubbling by default when inherit_data is configured

Author: derrabus

DependencyInjection/Configuration.php

@@ -1135,6 +1135,8 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('resource')
                     ->children()
                         ->arrayNode('resources')
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('name')
                             ->requiresAtLeastOneElement()
                             ->defaultValue(['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']])
                             ->beforeNormalization()
@@ -1157,6 +1159,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
                                 })
                             ->end()
                             ->prototype('array')
+                                ->performNoDeepMerging()
                                 ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
                                 ->prototype('scalar')->end()
                             ->end()

Tests/DependencyInjection/ConfigurationTest.php

@@ -232,6 +232,34 @@ public function provideValidLockConfigurationTests()
         yield [['enabled' => false, 'resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'foo', 'value' => 'semaphore'], ['name' => 'bar', 'value' => 'semaphore']]], ['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
     }
 
+    public function testLockMergeConfigs()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'lock' => [
+                    'payload' => 'flock',
+                ],
+            ],
+            [
+                'lock' => [
+                    'payload' => 'semaphore',
+                ],
+            ],
+        ]);
+
+        $this->assertEquals(
+            [
+                'enabled' => true,
+                'resources' => [
+                    'payload' => ['semaphore'],
+                ],
+            ],
+            $config['lock']
+        );
+    }
+
     public function testItShowANiceMessageIfTwoMessengerBusesAreConfiguredButNoDefaultBus()
     {
         $expectedMessage = 'You must specify the "default_bus" if you define more than one bus.';