ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -19,6 +19,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
@@ -28,7 +29,7 @@
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Bundle extends AbstractView
+class Bundle extends AbstractView implements ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -421,4 +422,13 @@ function (&$selection, $selectionId) use ($preConfiguredQtys) {
 
         return $options;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->selectedOptions = [];
+        $this->optionsPosition = [];
+    }
 }

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price/DisabledProductOptionPriceModifier.php

@@ -15,11 +15,12 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceModifierInterface;
 use Magento\Bundle\Model\ResourceModel\Selection as BundleSelection;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Remove bundle product from price index when all products in required option are disabled
  */
-class DisabledProductOptionPriceModifier implements PriceModifierInterface
+class DisabledProductOptionPriceModifier implements PriceModifierInterface, ResetAfterRequestInterface
 {
     /**
      * @var ResourceConnection
@@ -145,4 +146,12 @@ private function getBundleIds(array $entityIds): \Traversable
             yield $id;
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->websiteIdsOfProduct = [];
+    }
 }

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -11,12 +11,13 @@
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Query\Uid;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Collection to fetch bundle option data at resolution time.
  */
-class Collection
+class Collection implements ResetAfterRequestInterface
 {
     /**
      * Option type name
@@ -145,4 +146,13 @@ private function fetch() : array
 
         return $this->optionMap;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->optionMap = [];
+        $this->skuMap = [];
+    }
 }

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

@@ -16,14 +16,16 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Repository for categories.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInterface
+class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInterface,
+    ResetAfterRequestInterface
 {
     /**
      * @var Category[]
@@ -254,4 +256,12 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->instances = [];
+    }
 }

app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php

@@ -15,12 +15,13 @@
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\Store;
 
 /**
  * Add data to category entity and populate with default values
  */
-class PopulateWithValues
+class PopulateWithValues implements ResetAfterRequestInterface
 {
     /**
      * @var ScopeOverriddenValue
@@ -150,4 +151,12 @@ private function getAttributes(): array
 
         return $this->attributes;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->attributes = [];
+    }
 }

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

@@ -16,6 +16,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
 /**
@@ -43,7 +44,8 @@
 class Product extends \Magento\Catalog\Model\AbstractModel implements
     IdentityInterface,
     SaleableInterface,
-    ProductInterface
+    ProductInterface,
+    ResetAfterRequestInterface
 {
     /**
      * @var ProductLinkRepositoryInterface
@@ -2841,4 +2843,15 @@ public function setStockData($stockData)
         $this->setData('stock_data', $stockData);
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_customOptions = [];
+        $this->_errors = [];
+        $this->_canAffectOptions = [];
+        $this->_productIdCached = null;
+    }
 }

app/code/Magento/Catalog/Model/Product/Image/Cache.php

@@ -7,11 +7,12 @@
 
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 use Magento\Framework\App\Area;
 use Magento\Framework\View\ConfigInterface;
 
-class Cache
+class Cache implements ResetAfterRequestInterface
 {
     /**
      * @var ConfigInterface
@@ -127,4 +128,12 @@ protected function processImageData(Product $product, array $imageData, $file)
 
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->data = [];
+    }
 }

app/code/Magento/Catalog/Model/Product/Media/Config.php

@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Model\Product\Media;
 
 use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -16,7 +17,7 @@
  * @api
  * @since 100.0.2
  */
-class Config implements ConfigInterface
+class Config implements ConfigInterface, ResetAfterRequestInterface
 {
     /**
      * @var StoreManagerInterface
@@ -199,4 +200,12 @@ private function getAttributeHelper()
         }
         return $this->attributeHelper;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+       $this->mediaAttributeCodes = [];
+    }
 }

app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php

@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Catalog product option default type
@@ -23,7 +24,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class DefaultType extends \Magento\Framework\DataObject
+class DefaultType extends \Magento\Framework\DataObject implements ResetAfterRequestInterface
 {
     /**
      * Option Instance
@@ -426,4 +427,12 @@ protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
             return $price;
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_productOptions = [];
+    }
 }

app/code/Magento/Catalog/Model/Product/Price/TierPriceFactory.php

@@ -8,8 +8,9 @@
 
 use Magento\Catalog\Api\Data\TierPriceInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
-class TierPriceFactory
+class TierPriceFactory implements ResetAfterRequestInterface
 {
     /**
      * @var \Magento\Catalog\Api\Data\TierPriceInterfaceFactory
@@ -168,4 +169,12 @@ private function retrieveGroupValue($code)
 
         return $this->customerGroupsByCode[$code];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->customerGroupsByCode = [];
+    }
 }