ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

app/code/Magento/Catalog/Model/Layer.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Catalog view layer model
@@ -17,7 +18,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Layer extends \Magento\Framework\DataObject
+class Layer extends \Magento\Framework\DataObject implements ResetAfterRequestInterface
 {
     /**
      * Product collections array
@@ -266,4 +267,12 @@ public function getState()
 
         return $state;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_productCollections = [];
+    }
 }

app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php

@@ -12,11 +12,12 @@
 use GraphQL\Language\AST\NodeKind;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Joins attributes for provided field node field names.
  */
-class AttributesJoiner
+class AttributesJoiner implements ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -177,4 +178,12 @@ private function setSelectionsForFieldNode(FieldNode $fieldNode, array $selected
     {
         $this->queryFields[$fieldNode->name->value][$fieldNode->name->loc->start] = $selectedFields;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->queryFields = [];
+    }
 }

app/code/Magento/Cms/Model/Page/IdentityMap.php

@@ -8,11 +8,12 @@
 namespace Magento\Cms\Model\Page;
 
 use Magento\Cms\Model\Page;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Identity map of loaded pages.
  */
-class IdentityMap
+class IdentityMap implements ResetAfterRequestInterface
 {
     /**
      * @var Page[]
@@ -69,4 +70,12 @@ public function clear(): void
     {
         $this->pages = [];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->pages = [];
+    }
 }

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php

@@ -9,11 +9,12 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Provide configurable child products for price calculation
  */
-class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterface
+class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterface, ResetAfterRequestInterface
 {
     /**
      * @var Configurable
@@ -56,4 +57,12 @@ public function getProducts(ProductInterface $product)
         }
         return $this->products[$product->getId()];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->products = [];
+    }
 }

app/code/Magento/GraphQlCache/Model/CacheableQuery.php

@@ -7,10 +7,12 @@
 
 namespace Magento\GraphQlCache\Model;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * CacheableQuery should be used as a singleton for collecting HTTP cache-related info and tags of all entities.
  */
-class CacheableQuery
+class CacheableQuery implements ResetAfterRequestInterface
 {
     /**
      * @var string[]
@@ -75,4 +77,13 @@ public function shouldPopulateCacheHeadersWithTags() : bool
 
         return !empty($cacheTags) && $isQueryCacheable;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->cacheTags = [];
+        $this->cacheable = true;
+    }
 }

app/code/Magento/UrlRewrite/Model/UrlRewrite.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
@@ -40,7 +41,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
-class UrlRewrite extends AbstractModel
+class UrlRewrite extends AbstractModel implements ResetAfterRequestInterface
 {
     /**
      * @var Json
@@ -235,4 +236,12 @@ public function afterSave()
         $this->_getResource()->addCommitCallback([$this, 'cleanEntitiesCache']);
         return parent::afterSave();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+       $this->entityToCacheTagMap = [];
+    }
 }

dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php

@@ -15,6 +15,7 @@
 use Magento\TestFramework\App\ApiMutableScopeConfig;
 use Magento\TestFramework\Config\Model\ConfigStorage;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @inheritDoc
@@ -57,6 +58,20 @@ protected function setStoreConfigValue(array $matches, $configPathAndValue): voi
         parent::setStoreConfigValue($matches, $configPathAndValue);
     }
 
+    /**
+     * @inheritDoc
+     */
+    protected function _assignConfigData(TestCase $test)
+    {
+        parent::_assignConfigData($test);
+        $needUpdates = !empty($this->globalConfigValues)
+            || !empty($this->storeConfigValues)
+            || !empty($this->websiteConfigValues);
+        if ($needUpdates) {
+            $this->putPill();
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -99,6 +114,9 @@ protected function setWebsiteConfigValue(array $matches, $configPathAndValue): v
      */
     protected function _restoreConfigData()
     {
+        $needUpdates = !empty($this->globalConfigValues)
+            || !empty($this->storeConfigValues)
+            || !empty($this->websiteConfigValues);
         /** @var ConfigResource $configResource */
         $configResource = Bootstrap::getObjectManager()->get(ConfigResource::class);
         /* Restore global values */
@@ -145,8 +163,10 @@ protected function _restoreConfigData()
                 }
             }
         }
-        $this->putPill();
         $this->websiteConfigValues = [];
+        if ($needUpdates) {
+            $this->putPill();
+        }
 
     }
 

lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php

@@ -7,12 +7,14 @@
 
 namespace Magento\Framework\Api;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * Base Builder Class for simple data Objects
  * @deprecated 103.0.0 Every builder should have their own implementation of \Magento\Framework\Api\SimpleBuilderInterface
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-abstract class AbstractSimpleObjectBuilder implements SimpleBuilderInterface
+abstract class AbstractSimpleObjectBuilder implements SimpleBuilderInterface, ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -85,4 +87,12 @@ public function getData()
     {
         return $this->data;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->data = [];
+    }
 }

lib/internal/Magento/Framework/Api/SearchCriteriaBuilder.php

@@ -9,13 +9,14 @@
 namespace Magento\Framework\Api;
 
 use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Builder for SearchCriteria Service Data Object
  *
  * @api
  */
-class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
+class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder implements ResetAfterRequestInterface
 {
     /**
      * @var FilterGroupBuilder
@@ -145,4 +146,12 @@ public function setCurrentPage($currentPage)
     {
         return $this->_set(SearchCriteria::CURRENT_PAGE, $currentPage);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->data = [];
+    }
 }

lib/internal/Magento/Framework/App/ActionFlag.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * Request processing flag that allows to stop request dispatching in action controller from an observer
  * Downside of this approach is temporal coupling and global communication.
@@ -15,7 +17,7 @@
  * @api
  * @since 100.0.2
  */
-class ActionFlag
+class ActionFlag implements ResetAfterRequestInterface
 {
     /**
      * @var RequestInterface
@@ -83,4 +85,14 @@ protected function _getControllerKey()
     {
         return $this->_request->getRouteName() . '_' . $this->_request->getControllerName();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_flags = [];
+    }
+
+
 }