MC-31618: Move static config to files - PLUGIN_LIST

- Fix integration tests;

Author: adifucan

dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Interception;
 
+use Magento\Framework\Interception\ConfigLoaderInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
@@ -31,6 +33,8 @@ class PluginList extends \Magento\Framework\Interception\PluginList\PluginList
      * @param array $scopePriorityScheme
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
+     * @param ConfigLoaderInterface|null $configLoader
+     * @param ConfigWriterInterface|null $configWriter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -44,7 +48,9 @@ public function __construct(
         \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions,
         array $scopePriorityScheme,
         $cacheId = 'plugins',
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ConfigLoaderInterface $configLoader = null,
+        ConfigWriterInterface $configWriter = null
     ) {
         parent::__construct(
             $reader,
@@ -57,7 +63,9 @@ public function __construct(
             $classDefinitions,
             $scopePriorityScheme,
             $cacheId,
-            $serializer
+            $serializer,
+            $configLoader,
+            $configWriter
         );
         $this->_originScopeScheme = $this->_scopePriorityScheme;
     }

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Interception;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * Class GeneralTest
  *
@@ -81,6 +83,10 @@ public function setUpInterceptionConfig($pluginConfig)
         $cacheManager->method('load')->willReturn(null);
         $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
         $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
+        $dirList = new DirectoryList(DirectoryList::GENERATED_METADATA);
+        $configLoader = new \Magento\Framework\Interception\ConfigLoader($dirList);
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $configWriter = $this->createMock(\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class);
         $interceptionConfig = new Config\Config(
             $this->_configReader,
             $configScope,
@@ -104,6 +110,9 @@ public function setUpInterceptionConfig($pluginConfig)
             \Magento\Framework\ObjectManager\DefinitionInterface::class          => $definitions,
             \Magento\Framework\Interception\DefinitionInterface::class           => $interceptionDefinitions,
             \Magento\Framework\Serialize\SerializerInterface::class              => $json,
+            \Magento\Framework\Interception\ConfigLoaderInterface::class         => $configLoader,
+            \Psr\Log\LoggerInterface::class                                      => $logger,
+            \Magento\Framework\App\ObjectManager\ConfigWriterInterface::class    => $configWriter
         ];
         $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
             $factory,
@@ -120,6 +129,8 @@ public function setUpInterceptionConfig($pluginConfig)
                         \Magento\Framework\Interception\PluginList\PluginList::class,
                     \Magento\Framework\Interception\ChainInterface::class =>
                         \Magento\Framework\Interception\Chain\Chain::class,
+                    \Magento\Framework\Interception\ConfigWriterInterface::class =>
+                        \Magento\Framework\Interception\ConfigWriter::class
                 ],
             ]
         );

lib/internal/Magento/Framework/Interception/ConfigLoader.php

@@ -25,7 +25,11 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Load interception configuration data per scope.
+     *
+     * @param string $cacheId
+     * @return array
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function load($cacheId)
     {

lib/internal/Magento/Framework/Interception/ConfigWriter.php

@@ -143,7 +143,10 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Write interception configuration for scopes.
+     *
+     * @param array $scopes
+     * @return void
      */
     public function write($scopes)
     {

lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php

@@ -14,7 +14,7 @@ interface ConfigWriterInterface
      * Write interception configuration for scopes.
      *
      * @param array $scopes
-     * @return array
+     * @return void
      */
     public function write($scopes);
 }

lib/internal/Magento/Framework/Interception/PluginList/PluginList.php

@@ -9,6 +9,8 @@
 use Magento\Framework\Config\Data\Scoped;
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\ConfigLoaderInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Interception\DefinitionInterface;
 use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
@@ -17,8 +19,6 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Interception\ConfigLoader;
-use Magento\Framework\Interception\ConfigWriter;
 
 /**
  * Plugin config, provides list of plugins for a type
@@ -83,12 +83,12 @@ class PluginList extends Scoped implements InterceptionPluginList
     private $serializer;
 
     /**
-     * @var ConfigLoader
+     * @var ConfigLoaderInterface
      */
     private $configLoader;
 
     /**
-     * @var ConfigWriter
+     * @var ConfigWriterInterface
      */
     private $configWriter;
 
@@ -106,8 +106,8 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param array $scopePriorityScheme
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @param ConfigLoader|null $configLoader
-     * @param ConfigWriter|null $configWriter
+     * @param ConfigLoaderInterface|null $configLoader
+     * @param ConfigWriterInterface|null $configWriter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -122,8 +122,8 @@ public function __construct(
         array $scopePriorityScheme = ['global'],
         $cacheId = 'plugins',
         SerializerInterface $serializer = null,
-        ConfigLoader $configLoader = null,
-        ConfigWriter $configWriter = null
+        ConfigLoaderInterface $configLoader = null,
+        ConfigWriterInterface $configWriter = null
     ) {
         $this->serializer = $serializer ?: $objectManager->get(Serialize::class);
         parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer);
@@ -133,8 +133,8 @@ public function __construct(
         $this->_classDefinitions = $classDefinitions;
         $this->_scopePriorityScheme = $scopePriorityScheme;
         $this->_objectManager = $objectManager;
-        $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoader::class);
-        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriter::class);
+        $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoaderInterface::class);
+        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriterInterface::class);
     }
 
     /**

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

@@ -160,7 +160,7 @@ public function testExecute()
             ->with(ProgressBar::class)
             ->willReturn($progressBar);
 
-        $this->managerMock->expects($this->exactly(8))->method('addOperation')
+        $this->managerMock->expects($this->exactly(9))->method('addOperation')
             ->withConsecutive(
                 [OperationFactory::PROXY_GENERATOR, []],
                 [OperationFactory::REPOSITORY_GENERATOR, $this->anything()],
@@ -178,7 +178,8 @@ public function testExecute()
                 [OperationFactory::INTERCEPTION, $this->anything()],
                 [OperationFactory::AREA_CONFIG_GENERATOR, $this->anything()],
                 [OperationFactory::INTERCEPTION_CACHE, $this->anything()],
-                [OperationFactory::APPLICATION_ACTION_LIST_GENERATOR, $this->anything()]
+                [OperationFactory::APPLICATION_ACTION_LIST_GENERATOR, $this->anything()],
+                [OperationFactory::PLUGIN_LIST_GENERATOR, $this->anything()]
             );
 
         $this->managerMock->expects($this->once())->method('process');