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

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Customer/ViewModel/Customer/Auth.php

@@ -21,7 +21,8 @@ class Auth implements ArgumentInterface
      */
     public function __construct(
         private HttpContext $httpContext
-    ) {}
+    ) {
+    }
 
     /**
      * Check is user login

app/code/Magento/Customer/ViewModel/Customer/JsonSerializer.php

@@ -20,7 +20,8 @@ class JsonSerializer implements ArgumentInterface
      */
     public function __construct(
         private Json $jsonEncoder
-    ) {}
+    ) {
+    }
 
     /**
      * Encode the mixed $valueToEncode into the JSON format

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -12,7 +12,8 @@ use Magento\Framework\App\ObjectManager;
 /** @var Auth $authViewModel */
 $authViewModel = $block->getAuthViewModel() ?? ObjectManager::getInstance()->get(Auth::class);
 /** @var JsonSerializer $jsonSerializerViewModel */
-$jsonSerializerViewModel = $block->getJsonSerializerViewModel() ?? ObjectManager::getInstance()->get(JsonSerializer::class);
+$jsonSerializerViewModel = $block->getJsonSerializerViewModel() ??
+    ObjectManager::getInstance()->get(JsonSerializer::class);
 $customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
 $expirableSectionNames = $block->getExpirableSectionNames();
 ?>
@@ -22,7 +23,9 @@ $expirableSectionNames = $block->getExpirableSectionNames();
             "Magento_Customer/js/customer-data": {
                 "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializerViewModel->jsonEncode($expirableSectionNames) ?>,
+                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializerViewModel->jsonEncode(
+                    $expirableSectionNames
+                ) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
                 "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
                 "isLoggedIn": "<?= /* @noEscape */ $authViewModel->isLoggedIn() ?>"

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -26,7 +26,8 @@ public function __construct(
         private Http $request,
         private Context $context,
         private Json $serializer
-    ) {}
+    ) {
+    }
 
     /**
      * Return unique page identifier

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

@@ -28,7 +28,7 @@
     </type>
     <type name="Magento\Framework\App\PageCache\Kernel">
         <arguments>
-            <argument name="identifier" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierForSave</argument>
+            <argument name="identifierForSave" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierForSave</argument>
         </arguments>
     </type>
 </config>

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

@@ -63,6 +63,11 @@ class Kernel
      */
     private $state;
 
+    /**
+     * @var \Magento\Framework\App\PageCache\IdentifierInterface
+     */
+    private $identifierForSave;
+
     /**
      * @param Cache $cache
      * @param \Magento\Framework\App\PageCache\IdentifierInterface $identifier
@@ -73,6 +78,7 @@ class Kernel
      * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      * @param AppState|null $state
      * @param \Magento\PageCache\Model\Cache\Type|null $fullPageCache
+     * @param  \Magento\Framework\App\PageCache\IdentifierInterface $identifierForSave
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -84,7 +90,8 @@ public function __construct(
         \Magento\Framework\App\Response\HttpFactory $httpFactory = null,
         \Magento\Framework\Serialize\SerializerInterface $serializer = null,
         AppState $state = null,
-        \Magento\PageCache\Model\Cache\Type $fullPageCache = null
+        \Magento\PageCache\Model\Cache\Type $fullPageCache = null,
+        \Magento\Framework\App\PageCache\IdentifierInterface $identifierForSave = null
     ) {
         $this->cache = $cache;
         $this->identifier = $identifier;
@@ -103,6 +110,9 @@ public function __construct(
         $this->fullPageCache = $fullPageCache ?? ObjectManager::getInstance()->get(
             \Magento\PageCache\Model\Cache\Type::class
         );
+        $this->identifierForSave = $identifierForSave ?? ObjectManager::getInstance()->get(
+            \Magento\Framework\App\PageCache\IdentifierInterface::class
+        );
     }
 
     /**
@@ -159,7 +169,7 @@ public function process(\Magento\Framework\App\Response\Http $response)
 
                 $this->fullPageCache->save(
                     $this->serializer->serialize($this->getPreparedData($response)),
-                    $this->identifier->getValue(),
+                    $this->identifierForSave->getValue(),
                     $tags,
                     $maxAge
                 );