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

Author: JacobBrownAustin

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/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 = [];
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ResolverCache/MediaGalleryTest.php

@@ -284,8 +284,6 @@ public function testResolverCacheRecordIsCreatedForEachStoreView()
      */
     public function testMediaGalleryForProductVideos(callable $actionMechanismCallable, bool $isInvalidationAction)
     {
-        $this->markTestSkipped('Fixing this test in ACPT-1660');
-        
         // Test simple product with media
         $simpleProductWithMedia = $this->productRepository->get('simple_product_with_media');
 
@@ -596,24 +594,9 @@ private function assertCacheIdIsNotOrphanedInTagsForProduct(ProductInterface $pr
         $cacheLowLevelFrontend = $this->graphQlResolverCache->getLowLevelFrontend();
         $cacheIdPrefix = $cacheLowLevelFrontend->getOption('cache_id_prefix');
         $cacheBackend = $cacheLowLevelFrontend->getBackend();
-
-        $this->assertNotContains(
-            $cacheIdPrefix . $cacheKey,
-            $cacheBackend->getIdsMatchingTags([
-                $cacheIdPrefix . 'GRAPHQL_QUERY_RESOLVER_RESULT'
-            ]),
-            'Cache id is still present in GRAPHQL_QUERY_RESOLVER_RESULT tag file after invalidation'
-        );
-
-        $this->assertNotContains(
-            $cacheIdPrefix . $cacheKey,
-            $cacheBackend->getIdsMatchingTags([
-                $cacheIdPrefix . 'GQL_MEDIA_GALLERY_' . strtoupper($product->getSku()),
-            ]),
-            sprintf(
-                'Cache id is still present in GQL_MEDIA_GALLERY_%s tag file after invalidation',
-                strtoupper($product->getSku())
-            )
+        $this->assertFalse(
+            $this->graphQlResolverCache->test($cacheIdPrefix . 'GRAPHQL_QUERY_RESOLVER_RESULT'),
+            'Cache id is still present after invalidation'
         );
     }
 

lib/internal/Magento/Framework/App/Cache/State.php

@@ -10,11 +10,12 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Cache State
  */
-class State implements StateInterface
+class State implements StateInterface, ResetAfterRequestInterface
 {
     /**
      * Disallow cache
@@ -31,28 +32,28 @@ class State implements StateInterface
      *
      * @var DeploymentConfig
      */
-    private $config;
+    private readonly DeploymentConfig $config;
 
     /**
      * Deployment configuration storage writer
      *
      * @var Writer
      */
-    private $writer;
+    private readonly Writer $writer;
 
     /**
      * Associative array of cache type codes and their statuses (enabled/disabled)
      *
-     * @var array
+     * @var array|null
      */
-    private $statuses;
+    private ?array $statuses = null;
 
     /**
      * Whether all cache types are forced to be disabled
      *
      * @var bool
      */
-    private $banAll;
+    private readonly bool $banAll;
 
     /**
      * Constructor
@@ -119,4 +120,12 @@ private function load()
             $this->statuses = $this->config->getConfigData(self::CACHE_KEY) ?: [];
         }
     }
+
+    /**
+     * inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->statuses = null;
+    }
 }

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

@@ -47,7 +47,6 @@
         Magento\Framework\App\Cache\Frontend\Pool::class => null,
         Magento\Framework\App\Cache\Type\FrontendPool::class => null,
         Magento\Framework\App\DeploymentConfig\Writer::class => null,
-        Magento\Framework\App\Cache\State::class => null,
         Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile::class => null,
         Magento\Framework\Module\Dir\Reader::class => null,
         Magento\Framework\Module\PackageInfo::class => null,
@@ -399,8 +398,6 @@
         Magento\Framework\App\DeploymentConfig::class => null,
         Laminas\Uri\Uri::class => null,
         Magento\Framework\App\Cache\Frontend\Pool::class => null,
-        Magento\Framework\App\Cache\State::class =>
-            null, // TODO: Need to confirm that this gets reset when poison pill triggers
         Magento\TestFramework\App\State\Interceptor::class => null,
         Magento\TestFramework\App\MutableScopeConfig::class => null,
         Magento\TestFramework\Store\StoreManager::class => null,