Catalog fixes

Author: kandy

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

@@ -462,5 +462,12 @@ public function setOptionTypeId($optionTypeId)
         return $this->setData(self::KEY_OPTION_TYPE_ID, $optionTypeId);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        // @todo
+    }
     //@codeCoverageIgnoreEnd
 }

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

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
@@ -23,7 +24,7 @@
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
-class Price
+class Price implements ResetAfterRequestInterface
 {
     /**
      * Product price cache tag
@@ -657,4 +658,14 @@ public function isTierPriceFixed()
     {
         return true;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        self::$attributeCache = [];
+    }
+
+
 }

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

@@ -14,7 +14,7 @@
  * @api
  * @since 100.0.2
  */
-class Visibility extends \Magento\Framework\DataObject implements OptionSourceInterface
+class Visibility  implements OptionSourceInterface
 {
     const VISIBILITY_NOT_VISIBLE = 1;
 
@@ -49,7 +49,6 @@ public function __construct(
         array $data = []
     ) {
         $this->_eavEntityAttribute = $eavEntityAttribute;
-        parent::__construct($data);
     }
 
     /**

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

@@ -18,13 +18,14 @@
 use Magento\Framework\Api\Search\BucketInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\GraphQl\Query\Uid;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Category layer builder
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Category implements LayerBuilderInterface
+class Category implements LayerBuilderInterface, ResetAfterRequestInterface
 {
     /**
      * @var string
@@ -201,4 +202,17 @@ private function getStoreCategoryIds(int $storeId): array
         );
         return $collection->getAllIds();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        self::$bucketMap = [
+            self::CATEGORY_BUCKET => [
+                'request_name' => 'category_uid',
+                'label' => 'Category'
+            ],
+        ];
+    }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php

@@ -153,5 +153,6 @@ public function _resetState(): void
     {
         $this->productList = [];
         $this->productSkus = [];
+        $this->attributeCodes = [];
     }
 }

app/code/Magento/CatalogRule/Model/Rule.php

@@ -31,6 +31,7 @@
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Model\ResourceModel\Iterator;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\DateTime;
@@ -50,7 +51,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
-class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, IdentityInterface
+class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, IdentityInterface, ResetAfterRequestInterface
 {
     /**
      * Prefix of model events names
@@ -917,4 +918,12 @@ public function clearPriceRulesData(): void
     {
         self::$_priceRulesData = [];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        self::$_priceRulesData = [];
+    }
 }

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -14,6 +14,7 @@
 use Magento\Customer\Model\Data\Address as AddressData;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Address abstract model
@@ -35,7 +36,7 @@
  * @api
  * @since 100.0.2
  */
-class AbstractAddress extends AbstractExtensibleModel implements AddressModelInterface
+class AbstractAddress extends AbstractExtensibleModel implements AddressModelInterface, ResetAfterRequestInterface
 {
     /**
      * Possible customer address types
@@ -736,4 +737,13 @@ private function processCustomAttribute(array $attribute): array
 
         return $attribute;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        self::$_countryModels  = [];
+        self::$_regionModels = [];
+    }
 }

app/code/Magento/Customer/Model/Config/Share.php

@@ -139,4 +139,14 @@ public function getSharedWebsiteIds($websiteId)
         }
         return $ids;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        // @todo
+    }
+
+
 }

app/code/Magento/Customer/Model/Customer.php

@@ -1308,7 +1308,7 @@ public function isResetPasswordLinkTokenExpired()
         }
 
         $hourDifference = floor(($currentTimestamp - $tokenTimestamp) / (60 * 60));
-        
+
         return $hourDifference >= $expirationPeriod;
     }
 
@@ -1403,4 +1403,16 @@ public function getPassword()
     {
         return (string) $this->getData('password');
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        // @todo:
+
+        $this->_data = [];
+    }
+
+
 }

app/code/Magento/Customer/Model/Visitor.php

@@ -384,4 +384,16 @@ public function getOnlineInterval()
         );
         return $configValue ?: static::DEFAULT_ONLINE_MINUTES_INTERVAL;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+       //  @todo
+
+        $this->_data = [];
+    }
+
+
 }