ACP2E-2025: Refix ACP2E-1445 for multiple store views in the frontend.

 - Refactor the code.

Author: devarul

lib/internal/Magento/Framework/App/PageCache/IdentifierForSave.php renamed to app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -3,12 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\App\PageCache;
+namespace Magento\PageCache\Model\App\Request\Http;
 
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\PageCache\IdentifierInterface;
 
 /**
  * Page unique identifier
@@ -50,7 +51,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getValue(): string
+    public function getValue()
     {
         $data = [
             $this->request->isSecure(),

app/code/Magento/PageCache/etc/frontend/di.xml

@@ -26,4 +26,10 @@
     <type name="Magento\Framework\App\Response\Http">
         <plugin name="response-http-page-cache" type="Magento\PageCache\Model\App\Response\HttpPlugin"/>
     </type>
+    <type name="Magento\Framework\App\PageCache\Kernel">
+        <arguments>
+            <argument name="identifierForSave" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierForSave</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\Framework\App\PageCache\Identifier"/>
 </config>

lib/internal/Magento/Framework/App/PageCache/Identifier.php

@@ -48,7 +48,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getValue(): string
+    public function getValue()
     {
         $data = [
             $this->request->isSecure(),

lib/internal/Magento/Framework/App/PageCache/IdentifierInterface.php

@@ -8,8 +8,7 @@
 namespace Magento\Framework\App\PageCache;
 
 /**
- * @api
- * @since 100.0.2
+ * Page unique identifier interface
  */
 interface IdentifierInterface
 {
@@ -18,5 +17,5 @@ interface IdentifierInterface
      *
      * @return string
      */
-    public function getValue(): string;
+    public function getValue();
 }

lib/internal/Magento/Framework/App/PageCache/Kernel.php

@@ -24,7 +24,7 @@ class Kernel
     protected $cache;
 
     /**
-     * @var Identifier
+     * @var \Magento\Framework\App\PageCache\IdentifierInterface
      */
     protected $identifier;
 
@@ -64,33 +64,33 @@ class Kernel
     private $state;
 
     /**
-     * @var \Magento\Framework\App\PageCache\IdentifierForSave
+     * @var \Magento\Framework\App\PageCache\IdentifierInterface
      */
     private $identifierForSave;
 
     /**
      * @param Cache $cache
-     * @param Identifier $identifier
+     * @param \Magento\Framework\App\PageCache\IdentifierInterface $identifier
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\App\Http\Context|null $context
      * @param \Magento\Framework\App\Http\ContextFactory|null $contextFactory
      * @param \Magento\Framework\App\Response\HttpFactory|null $httpFactory
      * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      * @param AppState|null $state
      * @param \Magento\PageCache\Model\Cache\Type|null $fullPageCache
-     * @param  \Magento\Framework\App\PageCache\IdentifierForSave $identifierForSave
+     * @param  \Magento\Framework\App\PageCache\IdentifierInterface $identifierForSave
      */
     public function __construct(
         \Magento\Framework\App\PageCache\Cache $cache,
-        \Magento\Framework\App\PageCache\Identifier $identifier,
+        \Magento\Framework\App\PageCache\IdentifierInterface $identifier,
         \Magento\Framework\App\Request\Http $request,
         \Magento\Framework\App\Http\Context $context = null,
         \Magento\Framework\App\Http\ContextFactory $contextFactory = null,
         \Magento\Framework\App\Response\HttpFactory $httpFactory = null,
         \Magento\Framework\Serialize\SerializerInterface $serializer = null,
         AppState $state = null,
         \Magento\PageCache\Model\Cache\Type $fullPageCache = null,
-        \Magento\Framework\App\PageCache\IdentifierForSave $identifierForSave = null,
+        \Magento\Framework\App\PageCache\IdentifierInterface $identifierForSave = null,
     ) {
         $this->cache = $cache;
         $this->identifier = $identifier;
@@ -110,7 +110,7 @@ public function __construct(
             \Magento\PageCache\Model\Cache\Type::class
         );
         $this->identifierForSave = $identifierForSave ?? ObjectManager::getInstance()->get(
-                \Magento\Framework\App\PageCache\IdentifierForSave::class
+                \Magento\Framework\App\PageCache\IdentifierInterface::class
             );
     }