ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Aggregations/Category/IncludeDirectChildrenOnly.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\CategoryListInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Search\Response\Aggregation;
 use Magento\Framework\Search\Response\AggregationFactory;
 use Magento\Framework\Search\Response\BucketFactory;
@@ -18,7 +19,7 @@
 /**
  * Class to include only direct subcategories of category in aggregation
  */
-class IncludeDirectChildrenOnly
+class IncludeDirectChildrenOnly implements ResetAfterRequestInterface
 {
     /**
      * @var string
@@ -160,4 +161,12 @@ private function filterBucketValues(
         }
         return array_values($categoryBucketValues);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->filter = [];
+    }
 }

app/code/Magento/Directory/Helper/Data.php

@@ -16,6 +16,7 @@
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Json\Helper\Data as JsonData;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -26,7 +27,7 @@
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Data extends AbstractHelper
+class Data extends AbstractHelper implements ResetAfterRequestInterface
 {
     private const STORE_ID = 'store_id';
 
@@ -435,4 +436,13 @@ private function getCurrentScope(): array
 
         return $scope;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_regionJson = null;
+        $this->_currencyCache = [];
+    }
 }

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -22,6 +22,7 @@
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Entity/Attribute/Model - entity abstract
@@ -34,7 +35,8 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-abstract class AbstractEntity extends AbstractResource implements EntityInterface, DefaultAttributesProvider
+abstract class AbstractEntity extends AbstractResource implements EntityInterface, DefaultAttributesProvider,
+    ResetAfterRequestInterface
 {
     /**
      * @var \Magento\Eav\Model\Entity\AttributeLoaderInterface
@@ -2021,4 +2023,18 @@ protected function loadAttributesForObject($attributes, $object = null)
             }
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_attributesByCode = [];
+        $this->attributesByScope = [];
+        $this->_attributesByTable = [];
+        $this->_staticAttributes = [];
+        $this->_attributeValuesToDelete = [];
+        $this->_attributeValuesToSave = [];
+        self::$_attributeBackendTables = [];
+    }
 }

app/code/Magento/Email/Model/Template/Filter.php

@@ -1124,16 +1124,16 @@ public function filter($value)
         try {
             $value = parent::filter($value);
         } catch (Exception $e) {
-            // Since a single instance of this class can be used to filter content multiple times, reset callbacks to
-            // prevent callbacks running for unrelated content (e.g., email subject and email body)
-            $this->resetAfterFilterCallbacks();
-
             if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s')->render(), $e->getMessage());
             } else {
                 $value = (string) __("We're sorry, an error has occurred while generating this content.");
             }
             $this->_logger->critical($e);
+        } finally {
+            // Since a single instance of this class can be used to filter content multiple times, reset callbacks to
+            // prevent callbacks running for unrelated content (e.g., email subject and email body)
+            $this->resetAfterFilterCallbacks();
         }
         return $value;
     }

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/Tax/Model/Calculation.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
 use Magento\Tax\Api\TaxClassRepositoryInterface;
@@ -24,7 +25,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Calculation extends \Magento\Framework\Model\AbstractModel
+class Calculation extends \Magento\Framework\Model\AbstractModel implements ResetAfterRequestInterface
 {
     /**
      * Identifier constant for Tax calculation before discount excluding TAX
@@ -720,4 +721,16 @@ public function getTaxRates($billingAddress, $shippingAddress, $customerTaxClass
         }
         return $productRates;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_rates = [];
+        $this->_ctc = [];
+        $this->_ptc = [];
+        $this->_rateCache = [];
+        $this->_rateCalculationProcess = [];
+    }
 }

app/code/Magento/Tax/Model/ClassModelRegistry.php

@@ -7,13 +7,14 @@
 namespace Magento\Tax\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Tax\Model\ClassModel as TaxClassModel;
 use Magento\Tax\Model\ClassModelFactory as TaxClassModelFactory;
 
 /**
  * Registry for the tax class models
  */
-class ClassModelRegistry
+class ClassModelRegistry implements ResetAfterRequestInterface
 {
     /**
      * Tax class model factory
@@ -82,4 +83,12 @@ public function remove($taxClassId)
     {
         unset($this->taxClassRegistryById[$taxClassId]);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->taxClassRegistryById = [];
+    }
 }

app/code/Magento/Tax/Model/TaxCalculation.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Tax\Model;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Api\TaxClassManagementInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
@@ -23,7 +24,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class TaxCalculation implements TaxCalculationInterface
+class TaxCalculation implements TaxCalculationInterface, ResetAfterRequestInterface
 {
     /**
      * Tax Details factory
@@ -386,4 +387,13 @@ protected function getTotalQuantity(QuoteDetailsItemInterface $item)
         }
         return $item->getQuantity();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->keyedItems = [];
+        $this->parentToChildren = [];
+    }
 }