Merge remote-tracking branch '38141/develop' into comprs_nov

Author: engcom-Charlie

setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php

@@ -1,18 +1,20 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Setup\Module\Di\Code\Generator;
 
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Interception\Cache\CompiledConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Interception\Config\Config as InterceptionConfig;
-use Magento\Setup\Module\Di\Code\Reader\Type;
+use Magento\Framework\Interception\Definition\Runtime;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\InterceptableValidator;
+use Magento\Setup\Module\Di\Code\Reader\Type;
 
 class InterceptionConfigurationBuilder
 {
@@ -48,25 +50,33 @@ class InterceptionConfigurationBuilder
      */
     private $interceptableValidator;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $omConfig;
+
     /**
      * @param InterceptionConfig $interceptionConfig
      * @param PluginList $pluginList
      * @param Type $typeReader
      * @param Manager $cacheManager
      * @param InterceptableValidator $interceptableValidator
+     * @param ConfigInterface|null $omConfig
      */
     public function __construct(
         InterceptionConfig $interceptionConfig,
         PluginList $pluginList,
         Type $typeReader,
         Manager $cacheManager,
-        InterceptableValidator $interceptableValidator
+        InterceptableValidator $interceptableValidator,
+        ?ConfigInterface $omConfig = null
     ) {
         $this->interceptionConfig = $interceptionConfig;
         $this->pluginList = $pluginList;
         $this->typeReader = $typeReader;
         $this->cacheManager = $cacheManager;
         $this->interceptableValidator = $interceptableValidator;
+        $this->omConfig = $omConfig ?? ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -195,18 +205,26 @@ private function mergeAreaPlugins($inheritedConfig)
      * @param array $interceptionConfiguration
      * @return array
      */
-    private function getInterceptedMethods($interceptionConfiguration)
+    private function getInterceptedMethods(array $interceptionConfiguration): array
     {
-        $pluginDefinitionList = new \Magento\Framework\Interception\Definition\Runtime();
+        $pluginDefinitionList = new Runtime();
         foreach ($interceptionConfiguration as &$plugins) {
             $pluginsMethods = [];
+
             foreach ($plugins as $plugin) {
-                $pluginsMethods = array_unique(
-                    array_merge($pluginsMethods, array_keys($pluginDefinitionList->getMethodList($plugin)))
-                );
+                $plugin = $this->omConfig->getOriginalInstanceType($plugin);
+
+                $pluginsMethods = [
+                    ...$pluginsMethods,
+                    ...\array_keys(
+                        $pluginDefinitionList->getMethodList($plugin)
+                    )
+                ];
             }
-            $plugins = $pluginsMethods;
+
+            $plugins = \array_unique($pluginsMethods);
         }
+
         return $interceptionConfiguration;
     }
 }

setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,13 +10,13 @@
 use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Interception\Cache\CompiledConfig;
 use Magento\Framework\Interception\Config\Config;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\InterceptableValidator;
 use Magento\Setup\Module\Di\Code\Generator\InterceptionConfigurationBuilder;
 use Magento\Setup\Module\Di\Code\Generator\PluginList;
 use Magento\Setup\Module\Di\Code\Reader\Type;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 
 class InterceptionConfigurationBuilderTest extends TestCase
 {
@@ -50,25 +50,30 @@ class InterceptionConfigurationBuilderTest extends TestCase
      */
     private $interceptableValidator;
 
+    /**
+     * @var MockObject
+     */
+    private $omConfig;
+
     protected function setUp(): void
     {
-        $this->interceptionConfig =
-            $this->createPartialMock(Config::class, ['hasPlugins']);
+        $this->interceptionConfig = $this->createPartialMock(Config::class, ['hasPlugins']);
         $this->pluginList = $this->createPartialMock(
             PluginList::class,
             ['setInterceptedClasses', 'setScopePriorityScheme', 'getPluginsConfig']
         );
         $this->cacheManager = $this->createMock(Manager::class);
-        $this->interceptableValidator =
-            $this->createMock(InterceptableValidator::class);
+        $this->interceptableValidator = $this->createMock(InterceptableValidator::class);
+        $this->omConfig = $this->createMock(ConfigInterface::class);
 
         $this->typeReader = $this->createPartialMock(Type::class, ['isConcrete']);
         $this->model = new InterceptionConfigurationBuilder(
             $this->interceptionConfig,
             $this->pluginList,
             $this->typeReader,
             $this->cacheManager,
-            $this->interceptableValidator
+            $this->interceptableValidator,
+            $this->omConfig
         );
     }
 
@@ -106,6 +111,13 @@ public function testGetInterceptionConfiguration($plugins)
             ->method('getPluginsConfig')
             ->willReturn(['instance' => $plugins]);
 
+        $this->omConfig->expects($this->any())
+            ->method('getOriginalInstanceType')
+            ->willReturnMap([
+                ['stdClass', 'stdClass'],
+                ['virtualTypeClass', 'stdClass'],
+            ]);
+
         $this->model->addAreaCode('areaCode');
         $this->model->getInterceptionConfiguration($definedClasses);
     }
@@ -115,11 +127,15 @@ public function testGetInterceptionConfiguration($plugins)
      */
     public static function getInterceptionConfigurationDataProvider()
     {
-        $someInstance = new stdClass();
         return [
             [null],
-            [['plugin' => ['instance' => $someInstance]]],
-            [['plugin' => ['instance' => $someInstance], 'plugin2' => ['instance' => $someInstance]]]
+            [['plugin' => ['instance' => 'stdClass']]],
+            [[
+                'plugin'  => ['instance' => 'stdClass'],
+                'plugin1' => ['instance' => 'stdClass'],
+                'plugin2' => ['instance' => 'virtualTypeClass']
+            ]],
+            [['plugin' => ['instance' => 'virtualTypeClass']]],
         ];
     }
 }