ACPT-1552 WIP

Author: JacobBrownAustin

app/code/Magento/Theme/Model/Theme/ThemeProvider.php

@@ -6,14 +6,16 @@
 namespace Magento\Theme\Model\Theme;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Design\Theme\ListInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 
 /**
  * Provide data for theme grid and for theme edit page
  */
-class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProviderInterface
+class ThemeProvider implements ThemeProviderInterface, ResetAfterRequestInterface
 {
     /**
      * @var \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory
@@ -31,24 +33,24 @@ class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProvide
     protected $cache;
 
     /**
-     * @var \Magento\Framework\View\Design\ThemeInterface[]
+     * @var \Magento\Framework\View\Design\ThemeInterface[]|null
      */
     private $themes;
 
     /**
-     * @var ListInterface
+     * @var ListInterface|null
      */
     private $themeList;
 
     /**
      * @var DeploymentConfig
      */
-    private $deploymentConfig;
+    private readonly DeploymentConfig $deploymentConfig;
 
     /**
      * @var Json
      */
-    private $serializer;
+    private readonly Json $serializer;
 
     /**
      * ThemeProvider constructor.
@@ -183,4 +185,10 @@ private function getThemeList()
         }
         return $this->themeList;
     }
+
+    public function _resetState(): void
+    {
+        $this->themeList = null;
+        $this->themes = null;
+    }
 }

lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Css\PreProcessor\ErrorHandlerInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\PreProcessorInterface;
@@ -18,7 +19,7 @@
  * @magento_import instruction preprocessor
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) Must be deleted after moving themeProvider to construct
  */
-class MagentoImport implements PreProcessorInterface
+class MagentoImport implements PreProcessorInterface, ResetAfterRequestInterface
 {
     /**
      * PCRE pattern that matches @magento_import instruction
@@ -53,7 +54,7 @@ class MagentoImport implements PreProcessorInterface
     protected $themeList;
 
     /**
-     * @var ThemeProviderInterface
+     * @var ThemeProviderInterface|null
      */
     private $themeProvider;
 
@@ -145,7 +146,14 @@ private function getThemeProvider()
         if (null === $this->themeProvider) {
             $this->themeProvider = ObjectManager::getInstance()->get(ThemeProviderInterface::class);
         }
-
         return $this->themeProvider;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->themeProvider = null;
+    }
 }

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

@@ -371,7 +371,7 @@
         Magento\Customer\Model\Group\Interceptor::class => null,
         Magento\Store\Model\Group\Interceptor::class => null,
         Magento\Directory\Model\Currency\Interceptor::class => null,
-        Magento\Theme\Model\Theme\ThemeProvider::class => null, // Needs _resetState for themes
+//        Magento\Theme\Model\Theme\ThemeProvider::class => null, // Needs _resetState for themes
         Magento\Catalog\Model\Category\AttributeRepository::class => null, // Note: has reloadState
 //        Magento\Framework\Search\Request\Cleaner::class => null,  // FIXME: Needs resetState
         Magento\Catalog\Model\ResourceModel\Category\Interceptor::class => null,
@@ -423,10 +423,10 @@
             null, // Note: We may need to check to see if this needs to be reset when config changes
         Magento\ConfigurableProduct\Model\Product\Type\Configurable\Interceptor::class => null,
         Magento\Catalog\Model\Product\Type\Simple\Interceptor::class => null,
-        Magento\Customer\Model\Session\Storage::class =>
-            null,  // FIXME: race condition with Magento\Customer\Model\Session::_resetState()
-        Magento\Eav\Api\Data\AttributeExtension::class
-        => null, // FIXME: This needs to be fixed.   is_pagebuilder_enabled 0 => null
+//        Magento\Customer\Model\Session\Storage::class =>
+//            null,  // FIXME: race condition with Magento\Customer\Model\Session::_resetState()
+//        Magento\Eav\Api\Data\AttributeExtension::class
+//        => null, // FIXME: This needs to be fixed.   is_pagebuilder_enabled 0 => null
         Magento\TestFramework\Event\Magento::class => null,
         Magento\Store\Model\Website\Interceptor::class => null, // reset by poison pill
         Magento\Eav\Model\Entity\Type::class => null, // attribute types should be destroyed by poison pill