Merge remote-tracking branch 'performance/ACPT-1666-a' into ACPT-1666

Author: andimov

lib/internal/Magento/Framework/ObjectManager/Resetter/Resetter.php

@@ -8,6 +8,8 @@
 namespace Magento\Framework\ObjectManager\Resetter;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
 use WeakMap;
@@ -18,7 +20,8 @@
  */
 class Resetter implements ResetterInterface
 {
-    public const RESET_PATH = '/app/etc/reset.php';
+    public const RESET_PATH = 'reset.json';
+    private const RESET_STATE_METHOD = '_resetState';
 
     /** @var WeakMap instances to be reset after request */
     private WeakMap $resetAfterWeakMap;
@@ -29,21 +32,6 @@ class Resetter implements ResetterInterface
     /** @var WeakMapSorter|null Note: We use temporal coupling here because of chicken/egg during bootstrapping */
     private ?WeakMapSorter $weakMapSorter = null;
 
-    /**
-     * @var array
-     *
-     */
-    private array $classList = [
-        //phpcs:disable Magento2.PHP.LiteralNamespaces
-        'Magento\Framework\GraphQl\Query\Fields' => true,
-        'Magento\Store\Model\Store' => [
-            "_baseUrlCache" => [],
-            "_configCache" => null,
-            "_configCacheBaseNodes" => [],
-            "_dirCache" => [],
-            "_urlCache" => []
-        ]
-    ];
 
     /**
      * @var array
@@ -56,15 +44,34 @@ class Resetter implements ResetterInterface
      * @return void
      * @phpcs:disable Magento2.Functions.DiscouragedFunction
      */
-    public function __construct()
-    {
-        if (\file_exists(BP . self::RESET_PATH)) {
-            // phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
-            $this->classList = array_replace($this->classList, (require BP . self::RESET_PATH));
+    public function __construct(
+        private ComponentRegistrarInterface $componentRegistrar,
+        private array $classList = [],
+    ) {
+        foreach ($this->getPaths() as $resetPath) {
+            if (!\file_exists($resetPath)) {
+                continue;
+            }
+            $resetData = \json_decode(\file_get_contents($resetPath), true);
+            $this->classList = array_replace($this->classList, $resetData);
         }
         $this->resetAfterWeakMap = new WeakMap;
     }
 
+    /**
+     * Get paths for reset json
+     *
+     * @return \Generator<string>
+     */
+    private function getPaths(): \Generator
+    {
+        yield BP . '/app/etc/' . self::RESET_PATH;
+        foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $modulePath) {
+            yield $modulePath . '/etc/' . self::RESET_PATH;
+        }
+    }
+
+
     /**
      * Add instance to be reset later
      *
@@ -73,7 +80,10 @@ public function __construct()
      */
     public function addInstance(object $instance) : void
     {
-        if ($instance instanceof ResetAfterRequestInterface || isset($this->classList[\get_class($instance)])) {
+        if ($instance instanceof ResetAfterRequestInterface
+            || \method_exists($instance, self::RESET_STATE_METHOD)
+            || isset($this->classList[\get_class($instance)])
+        ) {
             $this->resetAfterWeakMap[$instance] = true;
         }
     }
@@ -125,6 +135,10 @@ public function setObjectManager(ObjectManagerInterface $objectManager) : void
      */
     private function resetStateWithReflection(object $instance)
     {
+        if (\method_exists($instance, self::RESET_STATE_METHOD)) {
+            $instance->{self::RESET_STATE_METHOD}();
+            return;
+        }
         $className = \get_class($instance);
         $reflectionClass = $this->reflectionCache[$className]
             ?? $this->reflectionCache[$className] = new \ReflectionClass($className);

lib/internal/Magento/Framework/ObjectManager/Resetter/ResetterFactory.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Framework\ObjectManager\Resetter;
 
+use Magento\Framework\ObjectManagerInterface;
+
 /**
  * Factory that creates Resetter based on environment variable.
  */
@@ -17,15 +19,18 @@ class ResetterFactory
      */
     private static string $resetterClassName = Resetter::class;
 
+    public function __construct(private ObjectManagerInterface $objectManager)
+    {
+    }
+
     /**
-     * Create resseter factory
+     * Create resseter instance
      *
      * @return ResetterInterface
-     * @phpcs:disable Magento2.Functions.StaticFunction
      */
-    public static function create() : ResetterInterface
+    public function create() : ResetterInterface
     {
-        return new static::$resetterClassName;
+        return $this->objectManager->create(static::$resetterClassName);
     }
 
     /**

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/Resetter.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\TestFramework\ApplicationStateComparator;
 
+use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\ObjectManager\Resetter\Resetter as OriginalResetter;
 use Magento\Framework\ObjectManager\Resetter\WeakMapSorter;
 use Magento\Framework\ObjectManagerInterface;
@@ -36,11 +37,11 @@ class Resetter extends OriginalResetter
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(ComponentRegistrarInterface $componentRegistrar, array $classList = [])
     {
         $this->collectedWeakMap = new WeakMap;
         $this->skipListAndFilterList =  new SkipListAndFilterList;
-        parent::__construct();
+        parent::__construct($componentRegistrar, $classList);
     }
 
     /**