ACPT-1929: Fixing race conditions in ACPT-1493

Author: JacobBrownAustin

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

@@ -37,15 +37,18 @@ class Resetter implements ResetterInterface
     private array $reflectionCache = [];
 
     /**
-     * @param ComponentRegistrarInterface $componentRegistrar
+     * @param ComponentRegistrarInterface|null $componentRegistrar
      * @param array $classList
      * @return void
      * @phpcs:disable Magento2.Functions.DiscouragedFunction
      */
     public function __construct(
-        private ComponentRegistrarInterface $componentRegistrar,
+        private ?ComponentRegistrarInterface $componentRegistrar = null,
         private array $classList = [],
     ) {
+        if (null === $componentRegistrar) {
+            $componentRegistrar = new ComponentRegistrar();
+        }
         foreach ($this->getPaths() as $resetPath) {
             if (!\file_exists($resetPath)) {
                 continue;

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.
  */
@@ -19,21 +17,15 @@ class ResetterFactory
      */
     private static string $resetterClassName = Resetter::class;
 
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(private ObjectManagerInterface $objectManager)
-    {
-    }
-
     /**
      * Create resseter instance
      *
      * @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

@@ -34,11 +34,11 @@ class Resetter extends OriginalResetter
     /**
      * Constructor
      *
-     * @param ComponentRegistrarInterface $componentRegistrar
+     * @param ComponentRegistrarInterface|null $componentRegistrar
      * @param array $classList
      * @return void
      */
-    public function __construct(ComponentRegistrarInterface $componentRegistrar, array $classList = [])
+    public function __construct(?ComponentRegistrarInterface $componentRegistrar = null, array $classList = [])
     {
         $this->collectedWeakMap = new WeakMap;
         $this->skipListAndFilterList =  new SkipListAndFilterList;