Skip to content

Commit cf20b91

Browse files
committed
MC-17864: Finalize @escapeNotVerified elimination
1 parent c20732c commit cf20b91

File tree

3 files changed

+52
-22
lines changed
  • app
    • code/Magento
    • design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer

3 files changed

+52
-22
lines changed

app/code/Magento/InstantPurchase/view/frontend/templates/button.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<script type="text/x-magento-init">
1515
{
1616
"#instant-purchase": {
17-
"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout();?>
17+
"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout();?>
1818
}
1919
}
2020
</script>
21-
<?php endif; ?>
21+
<?php endif; ?>

app/code/Magento/Translation/view/base/templates/translate.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<?php $version = $block->getTranslationFileVersion(); ?>
3030

31-
if (versionObj.version !== '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>') {
31+
if (versionObj.version !== '<?= $block->escapeJsQuote($version) ?>') {
3232
dependencies.push(
3333
'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
3434
);
@@ -44,7 +44,7 @@
4444
$.localStorage.set(
4545
'mage-translation-file-version',
4646
{
47-
version: '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>'
47+
version: '<?= $block->escapeJsQuote($version) ?>'
4848
}
4949
);
5050
} else {

app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<?php
108
/**
@@ -14,36 +12,68 @@
1412
*/
1513
?>
1614

17-
<?php if ($block->canShowBlock()): ?>
18-
<div class="block filter" id="layered-filter-block" data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
15+
<?php if ($block->canShowBlock()) : ?>
16+
<div class="block filter" id="layered-filter-block" data-mage-init='
17+
{
18+
"collapsible":
19+
{
20+
"openedState": "active",
21+
"collapsible": true,
22+
"active": false,
23+
"collateral":
24+
{
25+
"openedState": "filter-active",
26+
"element": "body"
27+
}
28+
}
29+
30+
}'>
1931
<?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
20-
<div class="block-title filter-title" data-count="<?= /* @escapeNotVerified */ $filtered ?>">
21-
<strong data-role="title"><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
32+
<div class="block-title filter-title" data-count="<?= /* @noEscape */ $filtered ?>">
33+
<strong data-role="title"><?= $block->escapeHtml(__('Shop By')); ?></strong>
2234
</div>
2335
<div class="block-content filter-content">
2436
<?= $block->getChildHtml('state') ?>
2537

26-
<?php if ($block->getLayer()->getState()->getFilters()): ?>
38+
<?php if ($block->getLayer()->getState()->getFilters()) : ?>
2739
<div class="block-actions filter-actions">
28-
<a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
40+
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear">
41+
<span><?= $block->escapeHtml(__('Clear All')) ?></span>
42+
</a>
2943
</div>
3044
<?php endif; ?>
3145
<?php $wrapOptions = false; ?>
32-
<?php foreach ($block->getFilters() as $filter): ?>
33-
<?php if ($filter->getItemsCount()): ?>
34-
<?php if (!$wrapOptions): ?>
35-
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
36-
<div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='{"accordion":{"openedState": "active", "collapsible": true, "active": false, "multipleCollapsible": false}}'>
37-
<?php $wrapOptions = true; endif; ?>
46+
<?php foreach ($block->getFilters() as $filter) : ?>
47+
<?php if ($filter->getItemsCount()) : ?>
48+
<?php if (!$wrapOptions) : ?>
49+
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle">
50+
<?= $block->escapeHtml(__('Shopping Options')) ?>
51+
</strong>
52+
<div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='
53+
{
54+
"accordion":
55+
{
56+
"openedState": "active",
57+
"collapsible": true,
58+
"active": false,
59+
"multipleCollapsible": false
60+
}
61+
}'>
62+
<?php $wrapOptions = true;
63+
endif; ?>
3864
<div data-role="collapsible" class="filter-options-item">
39-
<div data-role="title" class="filter-options-title"><?= /* @escapeNotVerified */ __($filter->getName()) ?></div>
40-
<div data-role="content" class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></div>
65+
<div data-role="title" class="filter-options-title">
66+
<?= $block->escapeHtml(__($filter->getName())) ?>
67+
</div>
68+
<div data-role="content" class="filter-options-content">
69+
<?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?>
70+
</div>
4171
</div>
4272
<?php endif; ?>
4373
<?php endforeach; ?>
44-
<?php if ($wrapOptions): ?>
74+
<?php if ($wrapOptions) : ?>
4575
</div>
46-
<?php else: ?>
76+
<?php else : ?>
4777
<script>
4878
require([
4979
'jquery'

0 commit comments

Comments
 (0)