Skip to content

Magento_Weee: avoid using deprecated escape* methods from AbstractBlock #31707

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_Weee: avoid using deprecated escape* methods from AbstractBlock #31707

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
17 changes: 10 additions & 7 deletions app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php
/** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
/**
* @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block
* @var \Magento\Framework\Escaper $escaper
*/

/** @var $_weeeHelper \Magento\Weee\Helper\Data */
$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
Expand All @@ -18,7 +21,7 @@ $_item = $block->getItem();
<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
<div class="price-excl-tax">
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Excl. Tax')) ?>:</span>
<?php endif; ?>

<?= $block->getRowPriceExclTaxHtml() ?>
Expand All @@ -27,14 +30,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= $block->getFinalRowPriceExclTaxHtml() ?>
</span>
<?php endif; ?>
Expand All @@ -44,7 +47,7 @@ $_item = $block->getItem();
<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
<div class="price-incl-tax">
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Incl. Tax')) ?>:</span>
<?php endif; ?>
<?= $block->getRowPriceInclTaxHtml() ?>

Expand All @@ -53,14 +56,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= $block->getFinalRowPriceInclTaxHtml() ?>
</span>
<?php endif; ?>
Expand Down
17 changes: 10 additions & 7 deletions app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php
/** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
/**
* @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block
* @var \Magento\Framework\Escaper $escaper
*/

/** @var $_weeeHelper \Magento\Weee\Helper\Data */
$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
Expand All @@ -18,7 +21,7 @@ $_item = $block->getItem();
<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
<div class="price-excl-tax">
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Excl. Tax')) ?>:</span>
<?php endif; ?>

<?= $block->getUnitPriceExclTaxHtml() ?>
Expand All @@ -28,14 +31,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= $block->getFinalUnitPriceExclTaxHtml() ?>
</span>
<?php endif; ?>
Expand All @@ -45,7 +48,7 @@ $_item = $block->getItem();
<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
<div class="price-incl-tax">
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Incl. Tax')) ?>:</span>
<?php endif; ?>
<?= $block->getUnitPriceInclTaxHtml() ?>

Expand All @@ -54,14 +57,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= $block->getFinalUnitPriceInclTaxHtml() ?>
</span>
<?php endif; ?>
Expand Down
17 changes: 10 additions & 7 deletions app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php
/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
/**
* @var $block \Magento\Weee\Block\Item\Price\Renderer
* @var \Magento\Framework\Escaper $escaper
*/

$_item = $block->getItem();
?>

<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Excl. Tax')) ?>:</span>
<?php endif; ?>
<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>

Expand All @@ -24,14 +27,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
</span>
<?php endif; ?>
Expand All @@ -40,21 +43,21 @@ $_item = $block->getItem();

<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
<?php if ($block->displayBothPrices()) : ?>
<br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
<br /><span class="label"><?= $escaper->escapeHtml(__('Incl. Tax')) ?>:</span>
<?php endif; ?>
<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
<br />
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
</span>
<?php endif; ?>
Expand Down
17 changes: 10 additions & 7 deletions app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php
/** @var \Magento\Weee\Block\Item\Price\Renderer $block */
/**
* @var \Magento\Weee\Block\Item\Price\Renderer $block
* @var \Magento\Framework\Escaper $escaper
*/
$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
$_item = $block->getItem();
?>

<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
<?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Excl. Tax')) ?>:</span>
<?php endif; ?>
<?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>

Expand All @@ -25,14 +28,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
</span>
<?php endif; ?>
Expand All @@ -42,7 +45,7 @@ $_item = $block->getItem();

<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
<?php if ($block->displayBothPrices()) : ?>
<br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
<br /><span class="label"><?= $escaper->escapeHtml(__('Incl. Tax')) ?>:</span>
<?php endif; ?>
<?php $_incl = $block->getTotalAmount($_item); ?>
<?= /* @noEscape */ $block->formatPrice(max(0, $_incl)) ?>
Expand All @@ -51,13 +54,13 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
</span>
<?php endif; ?>
Expand Down
17 changes: 10 additions & 7 deletions app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php
/** @var \Magento\Weee\Block\Item\Price\Renderer $block */
/**
* @var \Magento\Weee\Block\Item\Price\Renderer $block
* @var \Magento\Framework\Escaper $escaper
*/

$_item = $block->getItem();
?>

<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
<?php if ($block->displayBothPrices()) : ?>
<span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
<span class="label"><?= $escaper->escapeHtml(__('Excl. Tax')) ?>:</span>
<?php endif; ?>
<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>

Expand All @@ -23,14 +26,14 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<br />
<span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
</span>
<?php endif; ?>
Expand All @@ -40,7 +43,7 @@ $_item = $block->getItem();

<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
<?php if ($block->displayBothPrices()) : ?>
<br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
<br /><span class="label"><?= $escaper->escapeHtml(__('Incl. Tax')) ?>:</span>
<?php endif; ?>
<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>

Expand All @@ -49,13 +52,13 @@ $_item = $block->getItem();
<?php if ($block->displayPriceWithWeeeDetails()) : ?>
<small>
<?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
<span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
<span class="nobr"><?= $escaper->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
<?php endforeach; ?>
</small>
<?php endif; ?>

<?php if ($block->displayFinalPrice()) : ?>
<span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<span class="nobr"><?= $escaper->escapeHtml(__('Total Incl. Tax')) ?>:<br />
<?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
</span>
<?php endif; ?>
Expand Down
Loading