#24686: Static Content Deploy - Optimize files scanning performance

ihor-sviziev · web-flow · commit 1cc75d452dd5 · 2019-09-23T16:37:11.000+03:00
Fix one using array_merge in loop issue
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -371,12 +371,11 @@ public function getMainConfigFiles($asDataSet = true)
             }
             $globPaths = [BP . '/app/etc/config.xml', BP . '/app/etc/*/config.xml'];
             $configXmlPaths = array_merge($globPaths, $configXmlPaths);
-            $files = [];
+            $files = [[]];
             foreach ($configXmlPaths as $xmlPath) {
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $files = array_merge($files, glob($xmlPath, GLOB_NOSORT));
+                $files[] = glob($xmlPath, GLOB_NOSORT);
             }
-            self::$_cache[$cacheKey] = $files;
+            self::$_cache[$cacheKey] = array_merge(...$files);
         }
         if ($asDataSet) {
             return self::composeDataSets(self::$_cache[$cacheKey]);

Original file line number	Diff line number	Diff line change
`@@ -371,12 +371,11 @@ public function getMainConfigFiles($asDataSet = true)`
`371`	`371`	`}`
`372`	`372`	`$globPaths = [BP . '/app/etc/config.xml', BP . '/app/etc/*/config.xml'];`
`373`	`373`	`$configXmlPaths = array_merge($globPaths, $configXmlPaths);`
`374`		`- $files = [];`
	`374`	`+ $files = [[]];`
`375`	`375`	`foreach ($configXmlPaths as $xmlPath) {`
`376`		`- // phpcs:ignore Magento2.Performance.ForeachArrayMerge`
`377`		`- $files = array_merge($files, glob($xmlPath, GLOB_NOSORT));`
	`376`	`+ $files[] = glob($xmlPath, GLOB_NOSORT);`
`378`	`377`	`}`
`379`		`- self::$_cache[$cacheKey] = $files;`
	`378`	`+ self::$_cache[$cacheKey] = array_merge(...$files);`
`380`	`379`	`}`
`381`	`380`	`if ($asDataSet) {`
`382`	`381`	`return self::composeDataSets(self::$_cache[$cacheKey]);`