Skip to content

Magento_CatalogInventory: avoid using deprecated escape* methods from… #31717

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

Magento_CatalogInventory: avoid using deprecated escape* methods from… #31717

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
3 changes: 2 additions & 1 deletion app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

/**
* @var $block \Magento\CatalogInventory\Block\Qtyincrements
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php if ($block->getProductQtyIncrements()) : ?>
<div class="product pricing">
<?= $block->escapeHtml(__('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements())) ?>
<?= $escaper->escapeHtml(__('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements())) ?>
</div>
<?php endif ?>
21 changes: 11 additions & 10 deletions app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,36 @@

/**
* @var $block \Magento\CatalogInventory\Block\Stockqty\Composite
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php if ($block->isMsgVisible()) : ?>
<div class="availability only">
<a href="#"
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>"}}'
id="<?= $block->escapeHtmlAttr($block->getPlaceholderId()) ?>"
title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>"
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= $escaper->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>"}}'
id="<?= $escaper->escapeHtmlAttr($block->getPlaceholderId()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>"
class="action show">
<?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
<?= /* @noEscape */ __('Only %1 left', "<strong>{$escaper->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
</a>
</div>
<div class="availability only detailed" id="<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>">
<div class="availability only detailed" id="<?= $escaper->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>">
<div class="table-wrapper">
<table class="data table">
<caption class="table-caption"><?= $block->escapeHtml(__('Product availability')) ?></caption>
<caption class="table-caption"><?= $escaper->escapeHtml(__('Product availability')) ?></caption>
<thead>
<tr>
<th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
<th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
<th class="col item" scope="col"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
<th class="col qty" scope="col"><?= $escaper->escapeHtml(__('Qty')) ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($block->getChildProducts() as $childProduct) : ?>
<?php $childProductStockQty = $block->getProductStockQty($childProduct); ?>
<?php if ($childProductStockQty > 0) : ?>
<tr>
<td data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>" class="col item"><?= $block->escapeHtml($childProduct->getName()) ?></td>
<td data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>" class="col qty"><?= $block->escapeHtml($childProductStockQty) ?></td>
<td data-th="<?= $escaper->escapeHtmlAttr(__('Product Name')) ?>" class="col item"><?= $escaper->escapeHtml($childProduct->getName()) ?></td>
<td data-th="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>" class="col qty"><?= $escaper->escapeHtml($childProductStockQty) ?></td>
</tr>
<?php endif ?>
<?php endforeach ?>
Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

/**
* @var $block \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php if ($block->isMsgVisible()) : ?>
<div class="availability only" title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>">
<?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
<div class="availability only" title="<?= $escaper->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>">
<?= /* @noEscape */ __('Only %1 left', "<strong>{$escaper->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
</div>
<?php endif ?>