Move array_merge calls out of loops to improve performance

Author: simonberger

DependencyInjection/Configuration.php

@@ -1262,15 +1262,13 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                                 ->then(function ($v) {
                                     $resources = [];
                                     foreach ($v as $resource) {
-                                        $resources = array_merge_recursive(
-                                            $resources,
-                                            \is_array($resource) && isset($resource['name'])
-                                                ? [$resource['name'] => $resource['value']]
-                                                : ['default' => $resource]
-                                        );
+                                        $resources[] = \is_array($resource) && isset($resource['name'])
+                                            ? [$resource['name'] => $resource['value']]
+                                            : ['default' => $resource]
+                                        ;
                                     }
 
-                                    return $resources;
+                                    return array_merge_recursive([], ...$resources);
                                 })
                             ->end()
                             ->prototype('array')

Tests/CacheWarmer/SerializerCacheWarmerTest.php

@@ -15,18 +15,17 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\Serializer\Mapping\Loader\LoaderChain;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 
 class SerializerCacheWarmerTest extends TestCase
 {
-    public function testWarmUp()
+    /**
+     * @dataProvider loaderProvider
+     */
+    public function testWarmUp(array $loaders)
     {
-        $loaders = [
-            new XmlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/person.xml'),
-            new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/author.yml'),
-        ];
-
         $file = sys_get_temp_dir().'/cache-serializer.php';
         @unlink($file);
 
@@ -41,6 +40,26 @@ public function testWarmUp()
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
     }
 
+    public function loaderProvider()
+    {
+        return [
+            [
+                [
+                    new LoaderChain([
+                        new XmlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/person.xml'),
+                        new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/author.yml'),
+                    ]),
+                ],
+            ],
+            [
+                [
+                    new XmlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/person.xml'),
+                    new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/author.yml'),
+                ],
+            ],
+        ];
+    }
+
     public function testWarmUpWithoutLoader()
     {
         $file = sys_get_temp_dir().'/cache-serializer-without-loader.php';