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

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Customer/Test/Unit/ViewModel/Customer/JsonSerializerTest.php

@@ -40,11 +40,11 @@ protected function setUp(): void
     }
 
     /**
-     * Test json encode value.
+     * Test serialize value.
      *
      * @return void
      */
-    public function testJsonEncode(): void
+    public function testSerialize(): void
     {
         $this->jsonEncoderMock->expects($this->once())
             ->method('serialize')
@@ -60,7 +60,7 @@ function ($value) {
                     'http://example.com/customer/section/load/'
                 ]
             ),
-            $this->model->jsonEncode(['http://example.com/customer/section/load/'])
+            $this->model->serialize(['http://example.com/customer/section/load/'])
         );
     }
 }

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

@@ -31,6 +31,6 @@ public function __construct(
      */
     public function isLoggedIn(): bool|null
     {
-        return $this->httpContext->getValue(Context::CONTEXT_AUTH);
+        return $this->httpContext->getValue(Context::CONTEXT_AUTH) ?? false;
     }
 }

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

@@ -24,13 +24,13 @@ public function __construct(
     }
 
     /**
-     * Encode the mixed $valueToEncode into the JSON format
+     * Encode the mixed $value into the JSON format
      *
-     * @param mixed $valueToEncode
+     * @param mixed $value
      * @return string
      */
-    public function jsonEncode($valueToEncode): string
+    public function serialize(mixed $value): string
     {
-        return $this->jsonEncoder->serialize($valueToEncode);
+        return $this->jsonEncoder->serialize($value);
     }
 }

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

@@ -23,7 +23,7 @@ $expirableSectionNames = $block->getExpirableSectionNames();
             "Magento_Customer/js/customer-data": {
                 "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializer->jsonEncode(
+                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializer->serialize(
                     $expirableSectionNames
                 ) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",

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

@@ -47,5 +47,4 @@
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
     <preference for="Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface" type="Magento\PageCache\Model\PageCacheTagsPreprocessorComposite"/>
-    <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\Framework\App\PageCache\Identifier"/>
 </config>

app/etc/di.xml

@@ -2003,4 +2003,5 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\Filter\Input\PurifierInterface" type="Magento\Framework\Filter\Input\Purifier"/>
+    <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\Framework\App\PageCache\Identifier"/>
 </config>

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

@@ -78,7 +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
+     * @param  \Magento\Framework\App\PageCache\IdentifierInterface $identifierForSave|null
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(