compiled interceptors module

app/etc/di.xml

@@ -788,7 +788,7 @@
                 <item name="extensionInterfaceFactory" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator</item>
                 <item name="factory" xsi:type="string">\Magento\Framework\ObjectManager\Code\Generator\Factory</item>
                 <item name="proxy" xsi:type="string">\Magento\Framework\ObjectManager\Code\Generator\Proxy</item>
-                <item name="interceptor" xsi:type="string">\Magento\Framework\Interception\Code\Generator\Interceptor</item>
+                <item name="interceptor" xsi:type="string">Magento\Framework\Interception\Code\Generator\InterceptorInterface</item>
                 <item name="logger" xsi:type="string">\Magento\Framework\ObjectManager\Profiler\Code\Generator\Logger</item>
                 <item name="mapper" xsi:type="string">\Magento\Framework\Api\Code\Generator\Mapper</item>
                 <item name="persistor" xsi:type="string">\Magento\Framework\ObjectManager\Code\Generator\Persistor</item>
@@ -802,6 +802,21 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Framework\CompiledInterception\PluginList\PluginList"
+                 type="Magento\Framework\Interception\PluginList\PluginList">
+        <arguments>
+            <argument name="cache" xsi:type="object">\Magento\Framework\CompiledInterception\Generator\FileCache</argument>
+            <argument name="cacheId" xsi:type="string">compiled_plugins</argument>
+            <argument name="serializer" xsi:type="object">\Magento\Framework\CompiledInterception\Generator\NoSerialize</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\CompiledInterception\Generator\CompiledPluginList">
+        <arguments>
+            <argument name="pluginList" xsi:type="object">\Magento\Framework\CompiledInterception\PluginList\PluginList</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\Interception\Code\Generator\InterceptorInterface" type="Magento\Framework\Interception\Code\Generator\Interceptor"/>
+    <preference for="Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitutionInterface" type="Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitution"/>
     <type name="Magento\Framework\App\Cache\Frontend\Pool">
         <arguments>
             <argument name="frontendSettings" xsi:type="array">
@@ -1825,9 +1840,6 @@
                 type="Magento\Framework\Mail\MimeMessage" />
     <preference for="Magento\Framework\Mail\MimePartInterface"
                 type="Magento\Framework\Mail\MimePart" />
-    <type name="Magento\Framework\DB\Adapter\AdapterInterface">
-        <plugin name="execute_commit_callbacks" type="Magento\Framework\Model\ExecuteCommitCallbacks" />
-    </type>
     <preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
     <preference for="Magento\Framework\Filter\VariableResolverInterface" type="Magento\Framework\Filter\VariableResolver\StrategyResolver"/>
     <virtualType name="configured_block_cache" type="Magento\Framework\App\Cache">

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

@@ -20,6 +20,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * phpcs:disable Magento2.Functions.DiscouragedFunction
  */
 class Application
 {
@@ -725,6 +726,7 @@ protected function getCustomDirs()
             DirectoryList::STATIC_VIEW => [$path => "{$this->installDir}/pub/static"],
             DirectoryList::TMP_MATERIALIZATION_DIR => [$path => "{$var}/view_preprocessed/pub/static"],
             DirectoryList::GENERATED_CODE => [$path => "{$generated}/code"],
+            DirectoryList::STATIC_CACHE => [$path => "{$generated}/static_cache"],
             DirectoryList::CACHE => [$path => "{$var}/cache"],
             DirectoryList::LOG => [$path => "{$var}/log"],
             DirectoryList::SESSION => [$path => "{$var}/session"],

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

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Interception;
+
+use Magento\Framework\CompiledInterception\Generator\FileCache;
+use Magento\Framework\CompiledInterception\Generator\NoSerialize;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\Definition\Runtime as InterceptionDefinitionRuntime;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\Interception\PluginList\PluginList as OriginalPluginList;
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
+use Magento\Framework\ObjectManager\Definition\Runtime as ObjectManagerDefinitionRuntime;
+use Magento\Framework\ObjectManager\Relations\Runtime as ObjectManagerRelationsRuntime;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Provides compiled plugin list configuration.
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+class CompiledPluginList extends \Magento\Framework\CompiledInterception\Generator\CompiledPluginList
+{
+    /**
+     * @var PluginList
+     */
+    private $pluginList;
+
+    /**
+     * @param OriginalPluginList $unused
+     */
+    public function __construct(
+        OriginalPluginList $unused
+    ) {
+        $objectManager = ObjectManager::getInstance();
+        $this->pluginList = $objectManager->create(
+            PluginList::class,
+            [
+                $objectManager->get(Dom::class),
+                $objectManager->get(ScopeInterface ::class),
+                $objectManager->get(FileCache ::class),
+                $objectManager->get(ObjectManagerRelationsRuntime ::class),
+                $objectManager->get(ConfigInterface::class),
+                $objectManager->get(InterceptionDefinitionRuntime ::class),
+                $objectManager,
+                $objectManager->get(ObjectManagerDefinitionRuntime ::class),
+                ['global'],
+                'compiled_plugins',
+                $objectManager->get(NoSerialize ::class),
+            ]
+        );
+        parent::__construct($this->pluginList);
+    }
+
+    /**
+     * Reset internal cache
+     */
+    public function reset()
+    {
+        $this->pluginList->reset();
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/CompiledInterception/CompiledInterceptor/CompiledInterceptorTest.php

@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\CompiledInterception\CompiledInterceptor;
+
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\CompiledInterception\Generator\AreasPluginList;
+use Magento\Framework\CompiledInterception\Generator\CompiledInterceptor;
+use Magento\Framework\CompiledInterception\Generator\CompiledPluginList;
+use Magento\Framework\CompiledInterception\Generator\CompiledPluginListFactory;
+use Magento\Framework\CompiledInterception\Generator\FileCache;
+use Magento\Framework\CompiledInterception\Generator\NoSerialize;
+use Magento\Framework\CompiledInterception\Generator\StaticScope;
+use Magento\Framework\CompiledInterception\CompiledInterceptor\Custom\Module\Model\ComplexItem;
+use Magento\Framework\CompiledInterception\CompiledInterceptor\Custom\Module\Model\ComplexItemTyped;
+use Magento\Framework\CompiledInterception\CompiledInterceptor\Custom\Module\Model\Item;
+use Magento\Framework\CompiledInterception\CompiledInterceptor\Custom\Module\Model\SecondItem;
+use Magento\Framework\Config\ScopeInterfaceFactory;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\Interception\PluginList\PluginList;
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class CompiledInterceptorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Io|MockObject
+     */
+    private $ioGenerator;
+
+    /**
+     * @var AreaList|MockObject
+     */
+    private $areaList;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->ioGenerator = $this->getMockBuilder(Io::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->areaList = $this->getMockBuilder(AreaList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @return array
+     */
+    public function createScopeReaders()
+    {
+        $readerMap = include __DIR__ . '/_files/reader_mock_map.php';
+        $readerMock = $this->createMock(Dom::class);
+        $readerMock->method('read')->willReturnMap($readerMap);
+
+        $omMock = $this->createMock(ObjectManager::class);
+
+        $omConfigMock =  $this->getMockForAbstractClass(
+            ConfigInterface::class
+        );
+
+        $omConfigMock->method('getOriginalInstanceType')->willReturnArgument(0);
+        $ret = [];
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $directoryList = ObjectManager::getInstance()->get(DirectoryList::class);
+        //clear static cache
+        $fileCache = new FileCache($directoryList);
+        $fileCache->clean();
+        foreach ($readerMap as $readerLine) {
+            $pluginList = ObjectManager::getInstance()->create(
+                PluginList::class,
+                [
+                    'objectManager' => $omMock,
+                    'configScope' => new StaticScope($readerLine[0]),
+                    'reader' => $readerMock,
+                    'omConfig' => $omConfigMock,
+                    'cache' => $fileCache,
+                    'cachePath' => false,
+                    'serializer' => new NoSerialize()
+                ]
+            );
+
+            $ret[$readerLine[0]] = $objectManagerHelper->getObject(
+                CompiledPluginList::class,
+                [
+                    'pluginList' => $pluginList
+                ]
+            );
+        }
+        return $ret;
+    }
+
+    /**
+     * Checks a test case when interceptor generates code for the specified class.
+     *
+     * @param string $className
+     * @param string $resultClassName
+     * @param string $fileName
+     * @dataProvider interceptorDataProvider
+     */
+    public function testGenerate($className, $resultClassName, $fileName)
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        /** @var AreasPluginList $areaPlugins */
+        $areaPlugins = $objectManagerHelper->getObject(
+            AreasPluginList::class,
+            [
+                'areaList' => $this->areaList,
+                'scopeInterfaceFactory' => $objectManagerHelper->getObject(ScopeInterfaceFactory::class),
+                'compiledPluginListFactory' => $objectManagerHelper->getObject(CompiledPluginListFactory::class),
+                'plugins' => $this->createScopeReaders()
+            ]
+        );
+
+        /** @var CompiledInterceptor|MockObject $interceptor */
+        $interceptor = $this->getMockBuilder(CompiledInterceptor::class)
+            ->setMethods(['_validateData'])
+            ->setConstructorArgs(
+                [
+                    $areaPlugins,
+                    $className,
+                    $resultClassName,
+                    $this->ioGenerator,
+                    null,
+                    null
+                ]
+            )
+            ->getMock();
+
+        $this->ioGenerator->method('generateResultFileName')->with('\\' . $resultClassName)
+            ->willReturn($fileName . '.php');
+
+        $code = file_get_contents(__DIR__ . '/_out_interceptors/' . $fileName . '.txt');
+
+        $this->ioGenerator->method('writeResultFile')->with($fileName . '.php', $code);
+        $interceptor->method('_validateData')->willReturn(true);
+
+        $generated = $interceptor->generate();
+        $this->assertEquals($fileName . '.php', $generated, 'Generated interceptor is invalid.');
+    }
+
+    /**
+     * Gets list of interceptor samples.
+     *
+     * @return array
+     */
+    public function interceptorDataProvider()
+    {
+        return [
+            [
+                Item::class,
+                Item::class . '\Interceptor',
+                'Item'
+            ],
+            [
+                ComplexItem::class,
+                ComplexItem::class . '\Interceptor',
+                'ComplexItem'
+            ],
+            [
+                ComplexItemTyped::class,
+                ComplexItemTyped::class . '\Interceptor',
+                'ComplexItemTyped'
+            ],
+            [
+                SecondItem::class,
+                SecondItem::class . '\Interceptor',
+                'SecondItem'
+            ],
+        ];
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/CompiledInterception/CompiledInterceptor/Custom/Module/Model/ComplexItem.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+
+namespace Magento\Framework\CompiledInterception\CompiledInterceptor\Custom\Module\Model;
+
+class ComplexItem
+{
+    private $attribute;
+    private $variadicAttribute;
+
+    public function getName()
+    {
+        return $this->attribute;
+    }
+
+    /**
+     * @param $value
+     */
+    public function setValue($value)
+    {
+        $this->attribute = $value;
+    }
+
+    public function & getReference()
+    {
+    }
+
+    /**
+     * @param mixed ...$variadicValue
+     */
+    public function firstVariadicParameter(...$variadicValue)
+    {
+        $this->variadicAttribute = $variadicValue;
+    }
+
+    /**
+     * @param $value
+     * @param mixed ...$variadicValue
+     */
+    public function secondVariadicParameter($value, ...$variadicValue)
+    {
+        $this->attribute = $value;
+        $this->variadicAttribute = $variadicValue;
+    }
+
+    /**
+     * @param mixed ...$variadicValue
+     */
+    public function byRefVariadic(& ...$variadicValue)
+    {
+        $this->variadicAttribute = $variadicValue;
+    }
+
+    /**
+     *
+     */
+    public function returnsSelf()
+    {
+        return $this;
+    }
+}