ACPT-1709: Clean up skip-list for GraphQlState Test

 -- fix test failures

Author: andimov

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

@@ -8,8 +8,6 @@
 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;
@@ -19,8 +17,7 @@
  */
 class Resetter implements ResetterInterface
 {
-    public const RESET_PATH = 'reset.json';
-    private const RESET_STATE_METHOD = '_resetState';
+    public const RESET_PATH = '/app/etc/reset.php';
 
     /** @var WeakMap instances to be reset after request */
     private WeakMap $resetAfterWeakMap;
@@ -31,6 +28,22 @@ 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
      */
@@ -39,36 +52,16 @@ class Resetter implements ResetterInterface
     /**
      * Constructor
      *
-     * @param ComponentRegistrarInterface $componentRegistrar
-     * @param array $classList
      * @return void
      * @phpcs:disable Magento2.Functions.DiscouragedFunction
      */
-    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
+    public function __construct()
     {
-        yield BP . '/app/etc/' . self::RESET_PATH;
-        foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $modulePath) {
-            yield $modulePath . '/etc/' . self::RESET_PATH;
+        if (\file_exists(BP . self::RESET_PATH)) {
+            // phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
+            $this->classList = array_replace($this->classList, (require BP . self::RESET_PATH));
         }
+        $this->resetAfterWeakMap = new WeakMap;
     }
 
     /**
@@ -79,10 +72,7 @@ private function getPaths(): \Generator
      */
     public function addInstance(object $instance) : void
     {
-        if ($instance instanceof ResetAfterRequestInterface
-            || \method_exists($instance, self::RESET_STATE_METHOD)
-            || isset($this->classList[\get_class($instance)])
-        ) {
+        if ($instance instanceof ResetAfterRequestInterface || isset($this->classList[\get_class($instance)])) {
             $this->resetAfterWeakMap[$instance] = true;
         }
     }
@@ -134,10 +124,6 @@ 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,8 +7,6 @@
 
 namespace Magento\Framework\ObjectManager\Resetter;
 
-use Magento\Framework\ObjectManagerInterface;
-
 /**
  * Factory that creates Resetter based on environment variable.
  */
@@ -20,20 +18,14 @@ class ResetterFactory
     private static string $resetterClassName = Resetter::class;
 
     /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(private ObjectManagerInterface $objectManager)
-    {
-    }
-
-    /**
-     * Create resseter instance
+     * Create resseter factory
      *
      * @return ResetterInterface
+     * @phpcs:disable Magento2.Functions.StaticFunction
      */
-    public function create() : ResetterInterface
+    public static function create() : ResetterInterface
     {
-        return $this->objectManager->create(static::$resetterClassName);
+        return new static::$resetterClassName;
     }
 
     /**

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

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