ENGCOM-6037: Magento Framework - Performance improvements #24905

Author: VladimirZaets

lib/internal/Magento/Framework/Code/Reader/ClassReader.php

@@ -5,8 +5,15 @@
  */
 namespace Magento\Framework\Code\Reader;
 
+/**
+ * Class ClassReader
+ *
+ * @package Magento\Framework\Code\Reader
+ */
 class ClassReader implements ClassReaderInterface
 {
+    private $parentsCache = [];
+
     /**
      * Read class constructor signature
      *
@@ -54,6 +61,10 @@ public function getConstructor($className)
      */
     public function getParents($className)
     {
+        if (isset($this->parentsCache[$className])) {
+            return $this->parentsCache[$className];
+        }
+
         $parentClass = get_parent_class($className);
         if ($parentClass) {
             $result = [];
@@ -75,6 +86,9 @@ public function getParents($className)
                 $result = [];
             }
         }
+
+        $this->parentsCache[$className] = $result;
+
         return $result;
     }
 }

lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Code\Test\Unit\Reader;
+
+use Magento\Framework\Code\Reader\ClassReader;
+use PHPUnit\Framework\TestCase;
+
+require_once __DIR__ . '/_files/ClassesForArgumentsReader.php';
+
+class ClassReaderTest extends TestCase
+{
+
+    /**
+     * @var ClassReader $model
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->model = new ClassReader();
+    }
+
+    /**
+     * Get constructor test
+     *
+     * @param array $testData
+     * @dataProvider getTestData
+     * @throws \ReflectionException
+     */
+    public function testGetConstructor(array $testData)
+    {
+        $this->assertEquals(
+            $testData,
+            $this->model->getConstructor('FirstClassForParentCall')
+        );
+    }
+
+    /**
+     * Ensure that if we have cached class then returns this class
+     */
+    public function testGetParents()
+    {
+        $model = new ClassReader();
+        $this->assertEquals([0 => 'FirstClassForParentCall'], $model->getParents('ThirdClassForParentCall'));
+        $reflection = new \ReflectionClass(ClassReader::class);
+        $expectedClass = $reflection->getProperty('parentsCache');
+        $expectedClass->setAccessible(true);
+        $this->assertEquals(
+            $expectedClass->getValue($model)['ThirdClassForParentCall'],
+            $model->getParents('ThirdClassForParentCall')
+        );
+    }
+
+    /**
+     * Data provider
+     *
+     * @return array
+     */
+    public function getTestData()
+    {
+        return
+            [
+                [
+                    [
+                        0 => [
+                            0 => 'stdClassObject',
+                            1 => 'stdClass',
+                            2 => true,
+                            3 => null,
+                        ],
+                        1 => [
+                            0 => 'runeTimeException',
+                            1 => 'ClassExtendsDefaultPhpType',
+                            2 => true,
+                            3 => null,
+                        ],
+                        2 => [
+                            0 => 'arrayVariable',
+                            1 => null,
+                            2 => false,
+                            3 => [
+                                'key' => 'value',
+                            ]
+                        ]
+                    ]
+                ]
+            ];
+    }
+}

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

@@ -138,7 +138,7 @@ public function __construct(
     protected function _inheritPlugins($type)
     {
         $type = ltrim($type, '\\');
-        if (!array_key_exists($type, $this->_inherited)) {
+        if (!isset($this->_inherited[$type])) {
             $realType = $this->_omConfig->getOriginalInstanceType($type);
 
             if ($realType !== $type) {
@@ -292,28 +292,7 @@ protected function _loadScopedData()
                     $this->_loadedScopes[$scopeCode] = true;
                 }
             } else {
-                $virtualTypes = [];
-                foreach ($this->_scopePriorityScheme as $scopeCode) {
-                    if (false == isset($this->_loadedScopes[$scopeCode])) {
-                        $data = $this->_reader->read($scopeCode) ?: [];
-                        unset($data['preferences']);
-                        if (count($data) > 0) {
-                            $this->_inherited = [];
-                            $this->_processed = [];
-                            $this->merge($data);
-                            foreach ($data as $class => $config) {
-                                if (isset($config['type'])) {
-                                    $virtualTypes[] = $class;
-                                }
-                            }
-                        }
-                        $this->_loadedScopes[$scopeCode] = true;
-                    }
-                    if ($this->isCurrentScope($scopeCode)) {
-                        break;
-                    }
-                }
-                foreach ($virtualTypes as $class) {
+                foreach ($this->_loadScopedVirtualTypes() as $class) {
                     $this->_inheritPlugins($class);
                 }
                 foreach ($this->getClassDefinitions() as $class) {
@@ -328,6 +307,37 @@ protected function _loadScopedData()
         }
     }
 
+    /**
+     * Load virtual types for current scope
+     *
+     * @return array
+     */
+    private function _loadScopedVirtualTypes()
+    {
+        $virtualTypes = [];
+        foreach ($this->_scopePriorityScheme as $scopeCode) {
+            if (!isset($this->_loadedScopes[$scopeCode])) {
+                $data = $this->_reader->read($scopeCode) ?: [];
+                unset($data['preferences']);
+                if (count($data) > 0) {
+                    $this->_inherited = [];
+                    $this->_processed = [];
+                    $this->merge($data);
+                    foreach ($data as $class => $config) {
+                        if (isset($config['type'])) {
+                            $virtualTypes[] = $class;
+                        }
+                    }
+                }
+                $this->_loadedScopes[$scopeCode] = true;
+            }
+            if ($this->isCurrentScope($scopeCode)) {
+                break;
+            }
+        }
+        return $virtualTypes;
+    }
+
     /**
      * Whether scope code is current scope code
      *

lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php

@@ -7,6 +7,11 @@
  */
 namespace Magento\Framework\ObjectManager\Definition;
 
+/**
+ * Class Runtime
+ *
+ * @package Magento\Framework\ObjectManager\Definition
+ */
 class Runtime implements \Magento\Framework\ObjectManager\DefinitionInterface
 {
     /**
@@ -45,7 +50,7 @@ public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface
      */
     public function getParameters($className)
     {
-        if (!array_key_exists($className, $this->_definitions)) {
+        if (!isset($this->_definitions[$className])) {
             $this->_definitions[$className] = $this->_reader->getConstructor($className);
         }
         return $this->_definitions[$className];