Merge branch 'ACP2E-3447' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-11-14-2024

Author: chittima

app/code/Magento/Store/App/Request/StorePathInfoValidator.php

@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Store\App\Request;
@@ -11,6 +12,7 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\Request\PathInfo;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreIsInactiveException;
@@ -19,7 +21,7 @@
 /**
  * Gets the store from the path if valid
  */
-class StorePathInfoValidator
+class StorePathInfoValidator implements ResetAfterRequestInterface
 {
     /**
      * Store Config
@@ -43,6 +45,11 @@ class StorePathInfoValidator
      */
     private $storeCodeValidator;
 
+    /**
+     * @var array
+     */
+    private array $validatedStoreCodes = [];
+
     /**
      * @param ScopeConfigInterface $config
      * @param StoreRepositoryInterface $storeRepository
@@ -79,17 +86,25 @@ public function getValidStoreCode(Http $request, string $pathInfo = '') : ?strin
             $pathInfo = $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl());
         }
         $storeCode = $this->getStoreCode($pathInfo);
+
         if (empty($storeCode) || $storeCode === Store::ADMIN_CODE || !$this->storeCodeValidator->isValid($storeCode)) {
             return null;
         }
 
+        if (array_key_exists($storeCode, $this->validatedStoreCodes)) {
+            return $this->validatedStoreCodes[$storeCode];
+        }
+
         try {
             $this->storeRepository->getActiveStoreByCode($storeCode);
 
+            $this->validatedStoreCodes[$storeCode] = $storeCode;
             return $storeCode;
         } catch (NoSuchEntityException $e) {
+            $this->validatedStoreCodes[$storeCode] = null;
             return null;
         } catch (StoreIsInactiveException $e) {
+            $this->validatedStoreCodes[$storeCode] = null;
             return null;
         }
     }
@@ -105,4 +120,12 @@ private function getStoreCode(string $pathInfo) : string
         $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
         return current($pathParts);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->validatedStoreCodes = [];
+    }
 }

app/code/Magento/Store/Test/Unit/App/Request/StorePathInfoValidatorTest.php

@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Store\Test\Unit\App\Request;
@@ -183,6 +184,36 @@ public function testGetValidStoreCode(string $pathInfo, bool $isStoreCodeValid,
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @dataProvider getValidStoreCodeDataProvider
+     * @param string $pathInfo
+     * @param bool $isStoreCodeValid
+     * @param string|null $expectedResult
+     */
+    public function testGetValidStoreCodeResultIsCached(
+        string $pathInfo,
+        bool $isStoreCodeValid,
+        ?string $expectedResult
+    ): void {
+        $this->configMock->method('getValue')
+            ->with(Store::XML_PATH_STORE_IN_URL)
+            ->willReturn(true);
+        $this->pathInfoMock->method('getPathInfo')
+            ->willReturn('/store2/path2/');
+        $this->storeCodeValidatorMock->method('isValid')
+            ->willReturn($isStoreCodeValid);
+        $store = $this->createMock(Store::class);
+        $this->storeRepositoryMock
+            ->expects($expectedResult ? $this->once() : $this->never())
+            ->method('getActiveStoreByCode')
+            ->willReturn($store);
+
+        $result1 = $this->storePathInfoValidator->getValidStoreCode($this->requestMock, $pathInfo);
+        $result2 = $this->storePathInfoValidator->getValidStoreCode($this->requestMock, $pathInfo);
+        $this->assertEquals($expectedResult, $result1);
+        $this->assertEquals($result1, $result2);
+    }
+
     public static function getValidStoreCodeDataProvider(): array
     {
         return [