Fix array_merge in loop

Author: ihor-sviziev

setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Setup\Module\Di\App\Task\Operation;
 
-use Magento\Framework\App\Bootstrap;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
 use Magento\Setup\Module\Di\Code\Reader\ClassesScanner;
@@ -17,7 +16,7 @@ class ApplicationCodeGenerator implements OperationInterface
     /**
      * @var array
      */
-    private $data = [];
+    private $data;
 
     /**
      * @var ClassesScanner
@@ -66,15 +65,10 @@ public function doOperation()
             if (!is_array($paths)) {
                 $paths = (array)$paths;
             }
-            $files = [];
-            foreach ($paths as $path) {
-                $this->classesScanner->getList($path);
-                $files = array_merge_recursive(
-                    $files,
-                    $this->directoryScanner->scan($path, $this->data['filePatterns'], $this->data['excludePatterns'])
-                );
-            }
-            $entities = $this->phpScanner->collectEntities($files['php']);
+
+            $files = $this->getFiles($paths);
+
+            $entities = $this->phpScanner->collectEntities($files['php'] ?? []);
             foreach ($entities as $entityName) {
                 class_exists($entityName);
             }
@@ -90,4 +84,26 @@ public function getName()
     {
         return 'Application code generator';
     }
+
+    /**
+     * @param string[] $paths
+     * @return array
+     * @throws FileSystemException
+     */
+    private function getFiles(array $paths): array
+    {
+        $files = [];
+
+        foreach ($paths as $path) {
+            $this->classesScanner->getList($path);
+
+            $files[] = $this->directoryScanner->scan(
+                $path,
+                $this->data['filePatterns'],
+                $this->data['excludePatterns']
+            );
+        }
+
+        return array_merge_recursive([], ...$files);
+    }
 }

setup/src/Magento/Setup/Module/Di/App/Task/Operation/Interception.php

@@ -5,10 +5,12 @@
  */
 namespace Magento\Setup\Module\Di\App\Task\Operation;
 
+use Magento\Framework\App;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Interception\Code\Generator\Interceptor;
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
 use Magento\Setup\Module\Di\Code\Generator\InterceptionConfigurationBuilder;
-use Magento\Framework\Interception\Code\Generator\Interceptor;
-use Magento\Framework\App;
 use Magento\Setup\Module\Di\Code\GeneratorFactory;
 use Magento\Setup\Module\Di\Code\Reader\ClassesScanner;
 
@@ -27,7 +29,7 @@ class Interception implements OperationInterface
     /**
      * @var array
      */
-    private $data = [];
+    private $data;
 
     /**
      * @var ClassesScanner
@@ -80,14 +82,12 @@ public function doOperation()
                 $paths = (array)$paths;
             }
             foreach ($paths as $path) {
-                $classesList = array_merge($classesList, $this->classesScanner->getList($path));
+                $classesList[] = $this->classesScanner->getList($path);
             }
         }
+        $classesList = array_merge([], ...$classesList);
 
-        $generatorIo = new \Magento\Framework\Code\Generator\Io(
-            new \Magento\Framework\Filesystem\Driver\File(),
-            $this->data['path_to_store']
-        );
+        $generatorIo = new Io(new File(), $this->data['path_to_store']);
         $generator = $this->generatorFactory->create(
             [
                 'ioObject' => $generatorIo,

setup/src/Magento/Setup/Module/Di/App/Task/Operation/InterceptionCache.php

@@ -5,33 +5,35 @@
  */
 namespace Magento\Setup\Module\Di\App\Task\Operation;
 
+use Magento\Framework\Interception\Config\Config;
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
+use Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions;
 
 class InterceptionCache implements OperationInterface
 {
     /**
      * @var array
      */
-    private $data = [];
+    private $data;
 
     /**
-     * @var \Magento\Framework\Interception\Config\Config
+     * @var Config
      */
     private $configInterface;
 
     /**
-     * @var \Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions
+     * @var Interceptions
      */
     private $interceptionsInstancesNamesList;
 
     /**
-     * @param \Magento\Framework\Interception\Config\Config $configInterface
-     * @param \Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions $interceptionsInstancesNamesList
+     * @param Config $configInterface
+     * @param Interceptions $interceptionsInstancesNamesList
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Interception\Config\Config $configInterface,
-        \Magento\Setup\Module\Di\Code\Reader\Decorator\Interceptions $interceptionsInstancesNamesList,
+        Config $configInterface,
+        Interceptions $interceptionsInstancesNamesList,
         array $data = []
     ) {
         $this->configInterface = $configInterface;
@@ -56,10 +58,12 @@ public function doOperation()
                 $paths = (array)$paths;
             }
             foreach ($paths as $path) {
-                $definitions = array_merge($definitions, $this->interceptionsInstancesNamesList->getList($path));
+                $definitions[] = $this->interceptionsInstancesNamesList->getList($path);
             }
         }
 
+        $definitions = array_merge([], ...$definitions);
+
         $this->configInterface->initialize($definitions);
     }