Skip to content

Commit 17be334

Browse files
committed
ACP2E-3043: Re-implement solution from ACP2E-2025 where object manager is used in a wrong place
- Fixed the static test failure.
1 parent 12e5cc6 commit 17be334

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
use Magento\Customer\ViewModel\Customer\Data;
77
use Magento\Customer\ViewModel\CookieSettings;
88

9-
/** @var \Magento\Customer\Block\CustomerData $block */
9+
/**
10+
* @var \Magento\Customer\Block\CustomerData $block
11+
* @var \Magento\Framework\Escaper $escaper
12+
*/
1013

1114
// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
1215
/** @var Auth $auth */
@@ -22,14 +25,14 @@ $cookieSettings = $block->getCookieSettings();
2225
{
2326
"*": {
2427
"Magento_Customer/js/customer-data": {
25-
"sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
28+
"sectionLoadUrl": "<?= $escaper->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
2629
"expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
2730
"expirableSectionNames": <?= /* @noEscape */ $jsonSerializer->serialize(
2831
$expirableSectionNames
2932
) ?>,
30-
"cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
31-
"cookieDomain": "<?= $block->escapeJs($cookieSettings->getCookieDomain()) ?>",
32-
"updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
33+
"cookieLifeTime": "<?= $escaper->escapeJs($block->getCookieLifeTime()) ?>",
34+
"cookieDomain": "<?= $escaper->escapeJs($cookieSettings->getCookieDomain()) ?>",
35+
"updateSessionUrl": "<?= $escaper->escapeJs($customerDataUrl) ?>",
3336
"isLoggedIn": "<?= /* @noEscape */ $auth->isLoggedIn() ?>"
3437
}
3538
}

0 commit comments

Comments
 (0)