MC-31618: Move static config to files - PLUGIN_LIST

- Fix static tests;;

Author: adifucan

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -714,7 +714,6 @@ protected function getCustomDirs()
             DirectoryList::TMP => [$path => "{$var}/tmp"],
             DirectoryList::UPLOAD => [$path => "{$var}/upload"],
             DirectoryList::PUB => [$path => "{$this->installDir}/pub"],
-            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"]
         ];
         return $customDirs;
     }

dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php

@@ -45,11 +45,34 @@ protected function setUp(): void
     {
         $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
         $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            DriverInterface::class
+        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
+        $reader = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
         );
-        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            PluginListGenerator::class
+        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
+        $omConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
+        );
+        $relations = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Relations\Runtime::class
+        );
+        $definitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\Definition\Runtime::class
+        );
+        $classDefinitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Definition\Runtime::class
+        );
+        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
+        $this->model = new PluginListGenerator(
+            $reader,
+            $scopeConfig,
+            $omConfig,
+            $relations,
+            $definitions,
+            $classDefinitions,
+            $logger,
+            $this->directoryList,
+            ['primary', 'global']
         );
     }
 
@@ -71,7 +94,7 @@ public function testPluginListConfigGeneration()
                 2 => 'response-http-page-cache'
             ]
         ];
-        // Here in test I assume that this class below has 3 plugins. But the amount of plugins and class itself
+        // Here in test is assumed that this class below has 3 plugins. But the amount of plugins and class itself
         // may vary. If it is changed, please update these assertions.
         $this->assertArrayHasKey(
             'Magento\\Framework\\App\\Response\\Http_sendResponse___self',

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -5,8 +5,9 @@
  */
 namespace Magento\Setup\Console\Command;
 
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Filesystem\Io\File;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Filesystem;
@@ -72,6 +73,11 @@ class DiCompileCommand extends Command
      */
     private $componentRegistrar;
 
+    /**
+     * @var File
+     */
+    private $file;
+
     /**
      * Constructor
      *
@@ -82,6 +88,8 @@ class DiCompileCommand extends Command
      * @param Filesystem $filesystem
      * @param DriverInterface $fileDriver
      * @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
+     * @param File|null $file
+     * @throws \Magento\Setup\Exception
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -90,7 +98,8 @@ public function __construct(
         ObjectManagerProvider $objectManagerProvider,
         Filesystem $filesystem,
         DriverInterface $fileDriver,
-        ComponentRegistrar $componentRegistrar
+        ComponentRegistrar $componentRegistrar,
+        File $file = null
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->directoryList    = $directoryList;
@@ -99,6 +108,7 @@ public function __construct(
         $this->filesystem       = $filesystem;
         $this->fileDriver       = $fileDriver;
         $this->componentRegistrar  = $componentRegistrar;
+        $this->file = $file ?: ObjectManager::getInstance()->get(File::class);
         parent::__construct();
     }
 
@@ -227,10 +237,10 @@ private function getExcludedModulePaths(array $modulePaths)
     {
         $modulesByBasePath = [];
         foreach ($modulePaths as $modulePath) {
-            $moduleDir = basename($modulePath);
-            $vendorPath = dirname($modulePath);
-            $vendorDir = basename($vendorPath);
-            $basePath = dirname($vendorPath);
+            $moduleDir = $this->file->getPathInfo($modulePath)['basename'];
+            $vendorPath = $this->fileDriver->getParentDirectory($modulePath);
+            $vendorDir = $this->file->getPathInfo($vendorPath)['basename'];
+            $basePath = $this->fileDriver->getParentDirectory($vendorPath);
             $modulesByBasePath[$basePath][$vendorDir][] = $moduleDir;
         }
 
@@ -360,12 +370,9 @@ private function configureObjectManager(OutputInterface $output)
     private function getOperationsConfiguration(
         array $compiledPathsList
     ) {
-        $excludePatterns = [];
-        foreach ($this->excludedPathsList as $excludedPaths) {
-            $excludePatterns = array_merge($excludedPaths, $excludePatterns);
-        }
+        $excludePatterns = array_merge([], ...array_values($this->excludedPathsList));
 
-        $operations = [
+        return [
             OperationFactory::PROXY_GENERATOR => [],
             OperationFactory::REPOSITORY_GENERATOR => [
                 'paths' => $compiledPathsList['application'],
@@ -402,7 +409,5 @@ private function getOperationsConfiguration(
             OperationFactory::APPLICATION_ACTION_LIST_GENERATOR => [],
             OperationFactory::PLUGIN_LIST_GENERATOR => [],
         ];
-
-        return $operations;
     }
 }

setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php

@@ -19,47 +19,47 @@ class OperationFactory
     private $objectManager;
 
     /**
-     * Area
+     * Area config generator operation definition
      */
     const AREA_CONFIG_GENERATOR = 'area';
 
     /**
-     * Interception
+     * Interception operation definition
      */
     const INTERCEPTION = 'interception';
 
     /**
-     * Interception cache
+     * Interception cache operation definition
      */
     const INTERCEPTION_CACHE = 'interception_cache';
 
     /**
-     * Repository generator
+     * Repository generator operation definition
      */
     const REPOSITORY_GENERATOR = 'repository_generator';
 
     /**
-     * Proxy generator
+     * Proxy generator operation definition
      */
     const PROXY_GENERATOR = 'proxy_generator';
 
     /**
-     * Service data attributes generator
+     * Service data attributes generator operation definition
      */
     const DATA_ATTRIBUTES_GENERATOR = 'extension_attributes_generator';
 
     /**
-     * Application code generator
+     * Application code generator operation definition
      */
     const APPLICATION_CODE_GENERATOR = 'application_code_generator';
 
     /**
-     * Application action list generator
+     * Application action list generator operation definition
      */
     const APPLICATION_ACTION_LIST_GENERATOR = 'application_action_list_generator';
 
     /**
-     * Plugin list generator
+     * Plugin list generator operation definition
      */
     const PLUGIN_LIST_GENERATOR = 'plugin_list_generator';
 

setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php

@@ -65,6 +65,9 @@ class DiCompileCommandTest extends TestCase
     /** @var OutputFormatterInterface|MockObject */
     private $outputFormatterMock;
 
+    /** @var Filesystem\Io\File|MockObject */
+    private $fileMock;
+
     protected function setUp(): void
     {
         $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
@@ -96,6 +99,14 @@ protected function setUp(): void
         $this->fileDriverMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->fileDriverMock->method('getParentDirectory')->willReturnMap(
+            [
+                ['/path/to/module/one', '/path/to/module'],
+                ['/path/to/module', '/path/to'],
+                ['/path (1)/to/module/two', '/path (1)/to/module'],
+                ['/path (1)/to/module', '/path (1)/to'],
+            ]
+        );
         $this->componentRegistrarMock = $this->createMock(ComponentRegistrar::class);
         $this->componentRegistrarMock->expects($this->any())->method('getPaths')->willReturnMap([
             [ComponentRegistrar::MODULE, ['/path/to/module/one', '/path (1)/to/module/two']],
@@ -108,6 +119,17 @@ protected function setUp(): void
         $this->outputMock = $this->getMockForAbstractClass(OutputInterface::class);
         $this->outputMock->method('getFormatter')
             ->willReturn($this->outputFormatterMock);
+        $this->fileMock = $this->getMockBuilder(Filesystem\Io\File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fileMock->method('getPathInfo')->willReturnMap(
+            [
+                ['/path/to/module/one', ['basename' => 'one']],
+                ['/path/to/module', ['basename' => 'module']],
+                ['/path (1)/to/module/two', ['basename' => 'two']],
+                ['/path (1)/to/module', ['basename' => 'module']],
+            ]
+        );
 
         $this->command = new DiCompileCommand(
             $this->deploymentConfigMock,
@@ -116,7 +138,8 @@ protected function setUp(): void
             $objectManagerProviderMock,
             $this->filesystemMock,
             $this->fileDriverMock,
-            $this->componentRegistrarMock
+            $this->componentRegistrarMock,
+            $this->fileMock
         );
     }