Merge branch 'application-server' of github.com:magento-performance/magento2ce into application-server

Author: JacobBrownAustin

app/code/Magento/CatalogGraphQl/DataProvider/Product/RequestDataBuilder.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogGraphQl\DataProvider\Product;
+
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
+/**
+ * Builds request specific Product Search Query
+ */
+class RequestDataBuilder implements ResetAfterRequestInterface
+{
+    private array $data;
+
+    public function __construct()
+    {
+        $this->_resetState();
+    }
+
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    public function getData(string $key)
+    {
+        return $this->data[$key] ?? null;
+
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->data = [];
+    }
+}

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -69,6 +69,8 @@ class SearchCriteriaBuilder
      */
     private SearchConfig $searchConfig;
 
+    private RequestDataBuilder $localData;
+
     /**
      * @param Builder $builder
      * @param ScopeConfigInterface $scopeConfig
@@ -87,7 +89,8 @@ public function __construct(
         Visibility $visibility,
         SortOrderBuilder $sortOrderBuilder = null,
         Config $eavConfig = null,
-        SearchConfig $searchConfig = null
+        SearchConfig $searchConfig = null,
+        RequestDataBuilder $localData = null,
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->filterBuilder = $filterBuilder;
@@ -97,6 +100,7 @@ public function __construct(
         $this->sortOrderBuilder = $sortOrderBuilder ?? ObjectManager::getInstance()->get(SortOrderBuilder::class);
         $this->eavConfig = $eavConfig ?? ObjectManager::getInstance()->get(Config::class);
         $this->searchConfig = $searchConfig ?? ObjectManager::getInstance()->get(SearchConfig::class);
+        $this->localData = $localData ?? ObjectManager::getInstance()->get(RequestDataBuilder::class);
     }
 
     /**
@@ -169,7 +173,7 @@ private function updateMatchTypeRequestConfig(string $requestName, array $partia
                 }
             }
         }
-        $this->searchConfig->merge([$requestName => $data]);
+        $this->localData->setData([$requestName => $data]);
     }
 
     /**

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -9,13 +9,14 @@
 
 use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Provides product prices
  */
-class Provider implements ProviderInterface
+class Provider implements ProviderInterface, ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -33,6 +34,24 @@ class Provider implements ProviderInterface
         RegularPrice::PRICE_CODE => []
     ];
 
+    private readonly array $minimalPriceConstructed;
+    private readonly array $maximalPriceConstructed;
+
+    public function __construct()
+    {
+        $this->minimalPriceConstructed = $this->minimalPrice;
+        $this->maximalPriceConstructed = $this->maximalPrice;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->minimalPrice = $this->minimalPriceConstructed;
+        $this->maximalPrice = $this->maximalPriceConstructed;
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/Config/App/Config/ReloadConfig.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Config\App\Config;
+
+use Magento\Config\App\Config\Type\System;
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Config module specific reset state
+ */
+class ReloadConfig implements ReloadProcessorInterface
+{
+    public function __construct(private readonly System $system)
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        $this->system->get();
+    }
+}

app/code/Magento/Config/etc/di.xml

@@ -390,4 +390,11 @@
     <type name="Magento\Framework\App\Cache\TypeList">
         <plugin name="warm_config_cache" type="Magento\Config\Plugin\Framework\App\Cache\TypeList\WarmConfigCache"/>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_Config::config" xsi:type="object">Magento\Config\App\Config\ReloadConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/GraphQlResolverCache/Model/Resolver/Result/ValueProcessor.php

@@ -9,14 +9,15 @@
 
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\GraphQlResolverCache\Model\Resolver\Result\ValueProcessor\FlagSetter\FlagSetterInterface;
 use Magento\GraphQlResolverCache\Model\Resolver\Result\ValueProcessor\FlagGetter\FlagGetterInterface;
 
 /**
  * Value processor for cached resolver value.
  */
-class ValueProcessor implements ValueProcessorInterface
+class ValueProcessor implements ValueProcessorInterface, ResetAfterRequestInterface
 {
     /**
      * @var HydratorProviderInterface
@@ -161,4 +162,13 @@ public function preProcessValueBeforeCacheSave(ResolverInterface $resolver, &$va
             $dehydrator->dehydrate($value);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->hydrators = [];
+        $this->processedValues = [];
+    }
 }

app/code/Magento/Store/Model/Config/ReloadDeploymentConfig.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Store\Model\Config;
+
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\App\Config\Type\Scopes;
+use Magento\Store\Model\GroupRepository;
+use Magento\Store\Model\StoreRepository;
+use Magento\Store\Model\WebsiteRepository;
+
+/**
+ * Store module specific reset state part
+ */
+class ReloadDeploymentConfig implements ReloadProcessorInterface
+{
+
+    public function __construct(
+        private readonly StoreRepository $storeRepository,
+        private readonly WebsiteRepository $websiteRepository,
+        private readonly GroupRepository $groupRepository,
+        private readonly Scopes $scopes
+    )
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        // Note: Magento\Store\Model\StoreManager::reinitStores can't be called because it flushes the caches which
+        // we don't want to do because that is already taken care of.  Instead, we call the same clean methods that
+        // it calls, but we skip cleaning the cache.
+
+        $this->storeRepository->clean();
+        $this->websiteRepository->clean();
+        $this->groupRepository->clean();
+
+        $this->scopes->clean();
+        $this->scopes->get();
+    }
+}

app/code/Magento/Store/etc/di.xml

@@ -467,4 +467,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_ApplicationServer::process" xsi:type="object">Magento\Store\Model\Config\ReloadDeploymentConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Translation/App/Config/ReloadConfig.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Translation\App\Config;
+
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Translation\App\Config\Type\Translation;
+
+/**
+ * Translation module specific reset state part
+ */
+class ReloadConfig implements ReloadProcessorInterface
+{
+    /**
+     * @param Translation $translation
+     */
+    public function __construct(private readonly Translation $translation)
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        $this->translation->clean();
+    }
+}

app/code/Magento/Translation/etc/di.xml

@@ -149,4 +149,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_Translate::config" xsi:type="object">Magento\Translation\App\Config\ReloadConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>