Merge pull request #541 from magento-performance/ACPT-1263

ACPT-1263: Fix Catalog failures on app server

Author: andimov

app/code/Magento/Catalog/Model/Layer/Resolver.php

@@ -9,15 +9,17 @@
 
 namespace Magento\Catalog\Model\Layer;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * Layer Resolver
  *
  * @api
  */
-class Resolver
+class Resolver implements ResetAfterRequestInterface
 {
-    const CATALOG_LAYER_CATEGORY = 'category';
-    const CATALOG_LAYER_SEARCH = 'search';
+    public const CATALOG_LAYER_CATEGORY = 'category';
+    public const CATALOG_LAYER_SEARCH = 'search';
 
     /**
      * Catalog view layer models list
@@ -79,4 +81,12 @@ public function get()
         }
         return $this->layer;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->layer = null;
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/PriceAttributeOptionsLabelTranslateTest.php

@@ -201,6 +201,6 @@ public function testValidateAggregateAttributeOptionsInLabelLocaleTranslationFor
             }
         }
 
-        $this->assertEquals($priceAttributeOptionLabel, 'Preisansicht');
+        $this->assertEquals('Preisansicht', $priceAttributeOptionLabel);
     }
 }

lib/internal/Magento/Framework/App/Area.php

@@ -9,15 +9,14 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Application area model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  */
-class Area implements \Magento\Framework\App\AreaInterface, ResetAfterRequestInterface
+class Area implements \Magento\Framework\App\AreaInterface
 {
     public const AREA_GLOBAL = 'global';
     public const AREA_FRONTEND = 'frontend';
@@ -261,12 +260,4 @@ protected function _initDesign()
         $this->_getDesign()->setArea($this->_code)->setDefaultDesignTheme();
         return $this;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        $this->_loadedParts = [];
-    }
 }

lib/internal/Magento/Framework/App/AreaList.php

@@ -5,12 +5,14 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
 /**
  * Lists router area codes & processes resolves FrontEndNames to area codes
  *
  * @api
  */
-class AreaList
+class AreaList implements ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -127,4 +129,12 @@ public function getArea($code)
         }
         return $this->_areaInstances[$code];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_areaInstances = [];
+    }
 }

lib/internal/Magento/Framework/Translate.php

@@ -609,5 +609,6 @@ public function _resetState(): void
     {
         $this->_config = [];
         $this->_data = [];
+        $this->_localeCode = null;
     }
 }