ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

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

@@ -462,12 +462,5 @@ 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

@@ -666,6 +666,4 @@ 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  implements OptionSourceInterface
+class Visibility extends \Magento\Framework\DataObject implements OptionSourceInterface
 {
     const VISIBILITY_NOT_VISIBLE = 1;
 
@@ -49,6 +49,7 @@ public function __construct(
         array $data = []
     ) {
         $this->_eavEntityAttribute = $eavEntityAttribute;
+        parent::__construct($data);
     }
 
     /**

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

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

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

@@ -1403,16 +1403,4 @@ public function getPassword()
     {
         return (string) $this->getData('password');
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        // @todo:
-
-        $this->_data = [];
-    }
-
-
 }

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

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

app/code/Magento/Eav/Model/Entity/Attribute/Set.php

@@ -491,12 +491,5 @@ public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeSetExtensi
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        // @todo
-    }
     //@codeCoverageIgnoreEnd
 }

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -223,11 +223,7 @@ private function getDataFromRequest(RequestInterface $request): array
     {
         /** @var Http $request */
         if ($request->isPost()) {
-            try {
-                $data = $this->jsonSerializer->unserialize($request->getContent());
-            } catch (\InvalidArgumentException $e) {
-                throw new \Exception($request->getContent(), $e->getCode(), $e);
-            }
+            $data = $this->jsonSerializer->unserialize($request->getContent());
         } elseif ($request->isGet()) {
             $data = $request->getParams();
             $data['variables'] = isset($data['variables']) ?

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

@@ -7,12 +7,10 @@
 
 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 implements ResetAfterRequestInterface
+class CacheableQuery
 {
     /**
      * @var string[]
@@ -77,13 +75,4 @@ public function shouldPopulateCacheHeadersWithTags() : bool
 
         return !empty($cacheTags) && $isQueryCacheable;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        $this->cacheTags = [];
-        $this->cacheable = true;
-    }
 }

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

@@ -156,12 +156,4 @@ public function getIdentities()
     {
         return [self::CACHE_TAG . '_' . $this->getId()];
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        // @todo
-    }
 }