Skip to content

Chore: Layered Navigation - Replace Block Escaping with Escaper #37067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Chore: Layered Navigation - Replace Block Escaping with Escaper #37067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,44 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

use Magento\Framework\Escaper;
use Magento\LayeredNavigation\Block\Navigation\State;

/** @var Escaper $escaper */
/** @var State $block */
$_filters = $block->getActiveFilters();
?>
<?php
/**
* Category layered navigation state
*
* @var $block \Magento\LayeredNavigation\Block\Navigation\State
*/
?>
<?php $_filters = $block->getActiveFilters() ?>
<?php if (!empty($_filters)) : ?>
<div class="filter-current">
<strong class="block-subtitle filter-current-subtitle"
role="heading"
aria-level="2"
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?></strong>
<ol class="items">
<?php foreach ($_filters as $_filter) : ?>
<li class="item">
<span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
<span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
<span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
<span class="filter-value"><?= $escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
<?php
$clearLinkUrl = $_filter->getClearLinkUrl();
$currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
$currentFilterName = $escaper->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
if ($clearLinkUrl) :
?>
<a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
<span><?= $block->escapeHtml(__('Previous')) ?></span>
<a class="action previous" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Previous')) ?>">
<span><?= $escaper->escapeHtml(__('Previous')) ?></span>
</a>
<a class="action remove"
title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
href="<?= $block->escapeUrl($clearLinkUrl) ?>">
<span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
title="<?= $escaper->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
href="<?= $escaper->escapeUrl($clearLinkUrl) ?>">
<span><?= $escaper->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
</a>
<?php else : ?>
<a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
<span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
<a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
<span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
</a>
<?php endif; ?>
</li>
Expand Down
23 changes: 11 additions & 12 deletions app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,37 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php
/**
* Category layered navigation
*
* @var $block \Magento\LayeredNavigation\Block\Navigation
*/
?>
declare(strict_types=1);

use Magento\Framework\Escaper;
use Magento\LayeredNavigation\Block\Navigation;

/** @var Escaper $escaper */
/** @var Navigation $block */
?>
<?php if ($block->canShowBlock()) : ?>
<div class="block filter">
<div class="block-title filter-title">
<strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
<strong><?= $escaper->escapeHtml(__('Shop By')) ?></strong>
</div>

<div class="block-content filter-content">
<?= $block->getChildHtml('state') ?>

<?php if ($block->getLayer()->getState()->getFilters()) : ?>
<div class="block-actions filter-actions">
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
<a href="<?= $escaper->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $escaper->escapeHtml(__('Clear All')) ?></span></a>
</div>
<?php endif; ?>
<?php $wrapOptions = false; ?>
<?php foreach ($block->getFilters() as $filter) : ?>
<?php if (!$wrapOptions) : ?>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $escaper->escapeHtml(__('Shopping Options')) ?></strong>
<dl class="filter-options" id="narrow-by-list">
<?php $wrapOptions = true;
endif; ?>
<?php if ($filter->getItemsCount()) : ?>
<dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt>
<dt role="heading" aria-level="3" class="filter-options-title"><?= $escaper->escapeHtml(__($filter->getName())) ?></dt>
<dd class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></dd>
<?php endif; ?>
<?php endforeach; ?>
Expand Down