ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

lib/internal/Magento/Framework/App/Request/Http.php

@@ -7,11 +7,13 @@
 
 namespace Magento\Framework\App\Request;
 
+use Laminas\Stdlib\Parameters;
 use Magento\Framework\App\HttpRequestInterface;
 use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use Magento\Framework\Stdlib\StringUtils;
@@ -22,7 +24,7 @@
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @api
  */
-class Http extends Request implements RequestContentInterface, RequestSafetyInterface, HttpRequestInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface, HttpRequestInterface, ResetAfterRequestInterface
 {
     /**#@+
      * HTTP Ports
@@ -423,4 +425,34 @@ public function isSafeMethod()
         }
         return $this->isSafeMethod;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->setEnv(new Parameters($_ENV));
+        $this->serverParams = new Parameters($_SERVER);
+        $this->setQuery(new Parameters([]));
+        $this->setPost(new Parameters([]));
+        $this->setFiles(new Parameters([]));
+        $this->module = null;
+        $this->controller= null;
+        $this->action = null;
+        $this->pathInfo = '';
+        $this->requestString = '';
+        $this->params = [];
+        $this->aliases = [];
+        $this->dispatched = false;
+        $this->forwarded = null;
+        $this->baseUrl = null;
+        $this->basePath = null;
+        $this->requestUri = null;
+        $this->method = 'GET';
+        $this->allowCustomMethods = true;
+        $this->uri = null;
+        $this->headers = null;
+        $this->metadata = [];
+        $this->content = '';
+    }
 }

lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php

@@ -17,6 +17,7 @@
 use GraphQL\Validator\Rules\QueryDepth;
 use GraphQL\Validator\Rules\QueryComplexity;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * QueryComplexityLimiter
@@ -27,7 +28,7 @@
  *
  * https://github.com/webonyx/graphql-php/blob/master/docs/security.md#query-complexity-analysis
  */
-class QueryComplexityLimiter
+class QueryComplexityLimiter implements ResetAfterRequestInterface
 {
     /**
      * @var int
@@ -44,6 +45,8 @@ class QueryComplexityLimiter
      */
     private $introspectionConfig;
 
+
+    private $rules = [];
     /**
      * @param int $queryDepth
      * @param int $queryComplexity
@@ -59,6 +62,16 @@ public function __construct(
         $this->introspectionConfig = $introspectionConfig;
     }
 
+
+    private function getRules()
+    {
+        if (empty($this->rules)) {
+            $this->rules[] = new QueryComplexity($this->queryComplexity);
+            $this->rules[] = new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled());
+            $this->rules[] = new QueryDepth($this->queryDepth);
+        }
+        return $this->rules;
+    }
     /**
      * Sets limits for query complexity
      *
@@ -67,11 +80,9 @@ public function __construct(
      */
     public function execute(): void
     {
-        DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-        DocumentValidator::addRule(
-            new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled())
-        );
-        DocumentValidator::addRule(new QueryDepth($this->queryDepth));
+        foreach ($this->getRules() as $rule) {
+            DocumentValidator::addRule($rule);
+        }
     }
 
     /**
@@ -108,4 +119,16 @@ public function validateFieldCount(string $query): void
             }
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        foreach ($this->getRules() as $rule) {
+            DocumentValidator::removeRule($rule);
+            unset($rule);
+        };
+        $this->rules = [];
+    }
 }

lib/internal/Magento/Framework/Locale/Resolver.php

@@ -181,5 +181,6 @@ public function revert()
     public function _resetState(): void
     {
         $this->locale = null;
+        $this->emulatedLocales = [];
     }
 }

lib/internal/Magento/Framework/Url.php

@@ -7,6 +7,7 @@
 namespace Magento\Framework;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Url\HostChecker;
 
@@ -64,7 +65,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
-class Url extends \Magento\Framework\DataObject implements \Magento\Framework\UrlInterface
+class Url extends \Magento\Framework\DataObject implements \Magento\Framework\UrlInterface, ResetAfterRequestInterface
 {
     /**
      * Configuration data cache
@@ -1192,6 +1193,7 @@ private function getEscaper()
     public function _resetState(): void
     {
         $this->_data = [];
+        $this->cacheUrl = [];
         self::$_configDataCache = [];
     }
 }

lib/internal/Magento/Framework/View/Asset/Repository.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\View\Asset;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -19,7 +20,7 @@
  * @api
  * @since 100.0.2
  */
-class Repository
+class Repository implements ResetAfterRequestInterface
 {
     /**
      * Scope separator for module notation of file ID
@@ -467,4 +468,13 @@ private function getRepositoryFilesMap($fileId, array $params)
         $repositoryMap = ObjectManager::getInstance()->get(RepositoryMap::class);
         return $repositoryMap->getMap($fileId, $params);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->fallbackContext = [];
+        $this->fileContext = [];
+    }
 }