Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3043' into Tier4-Kings-PR-01-20-2025

Author: lakshmana49

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

@@ -1,20 +1,21 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 use Magento\Customer\ViewModel\Customer\Data;
-use Magento\Framework\App\ObjectManager;
 use Magento\Customer\ViewModel\CookieSettings;
 
-/** @var \Magento\Customer\Block\CustomerData $block */
+/**
+ * @var \Magento\Customer\Block\CustomerData $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
 /** @var Auth $auth */
-$auth = $block->getAuth() ?? ObjectManager::getInstance()->get(Auth::class);
+$auth = $block->getAuth();
 /** @var JsonSerializer $jsonSerializer */
-$jsonSerializer = $block->getJsonSerializer() ??
-    ObjectManager::getInstance()->get(JsonSerializer::class);
+$jsonSerializer = $block->getJsonSerializer();
 $customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
 $expirableSectionNames = $block->getExpirableSectionNames();
 /** @var CookieSettings $cookieSettings */
@@ -24,14 +25,14 @@ $cookieSettings = $block->getCookieSettings();
     {
         "*": {
             "Magento_Customer/js/customer-data": {
-                "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
+                "sectionLoadUrl": "<?= $escaper->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
                 "expirableSectionNames": <?= /* @noEscape */ $jsonSerializer->serialize(
                     $expirableSectionNames
                 ) ?>,
-                "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "cookieDomain": "<?= $block->escapeJs($cookieSettings->getCookieDomain()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
+                "cookieLifeTime": "<?= $escaper->escapeJs($block->getCookieLifeTime()) ?>",
+                "cookieDomain": "<?= $escaper->escapeJs($cookieSettings->getCookieDomain()) ?>",
+                "updateSessionUrl": "<?= $escaper->escapeJs($customerDataUrl) ?>",
                 "isLoggedIn": "<?= /* @noEscape */ $auth->isLoggedIn() ?>"
             }
         }