From a1bd4d9e0619703d27274d14c75e4c161e2cdb7e Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Mon, 13 May 2019 19:52:59 -0500
Subject: [PATCH 01/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../adminhtml/templates/items/price/row.phtml | 11 ++---
 .../templates/items/price/total.phtml         |  5 +--
 .../templates/items/price/unit.phtml          | 11 ++---
 .../order/create/items/price/row.phtml        | 11 ++---
 .../order/create/items/price/total.phtml      | 11 ++---
 .../order/create/items/price/unit.phtml       | 11 ++---
 .../view/adminhtml/templates/rate/form.phtml  |  3 --
 .../view/adminhtml/templates/rate/js.phtml    |  5 +--
 .../view/adminhtml/templates/rate/title.phtml | 15 +++----
 .../view/adminhtml/templates/rule/edit.phtml  | 32 +++++++-------
 .../adminhtml/templates/rule/rate/form.phtml  |  3 +-
 .../templates/toolbar/class/add.phtml         | 11 -----
 .../templates/toolbar/class/save.phtml        | 24 -----------
 .../templates/toolbar/rate/add.phtml          |  3 --
 .../templates/toolbar/rate/save.phtml         |  5 +--
 .../templates/toolbar/rule/add.phtml          | 11 -----
 .../templates/toolbar/rule/save.phtml         | 25 -----------
 .../base/templates/pricing/adjustment.phtml   |  9 ++--
 .../templates/pricing/adjustment/bundle.phtml | 11 ++---
 .../checkout/cart/item/price/sidebar.phtml    | 10 ++---
 .../templates/checkout/grandtotal.phtml       | 28 ++++++------
 .../templates/checkout/shipping.phtml         | 32 +++++++-------
 .../templates/checkout/shipping/price.phtml   | 11 ++---
 .../templates/checkout/subtotal.phtml         | 26 ++++++-----
 .../frontend/templates/checkout/tax.phtml     | 22 +++++-----
 .../templates/email/items/price/row.phtml     | 11 ++---
 .../frontend/templates/item/price/row.phtml   |  6 +--
 .../item/price/total_after_discount.phtml     |  4 +-
 .../frontend/templates/item/price/unit.phtml  |  6 +--
 .../view/frontend/templates/order/tax.phtml   | 21 ++++-----
 .../adminhtml/templates/items/price/row.phtml | 15 +++----
 .../templates/items/price/total.phtml         |  5 +--
 .../templates/items/price/unit.phtml          | 15 +++----
 .../order/create/items/price/row.phtml        | 23 +++++-----
 .../order/create/items/price/total.phtml      | 23 +++++-----
 .../order/create/items/price/unit.phtml       | 23 +++++-----
 .../adminhtml/templates/renderer/tax.phtml    | 43 +++++++++----------
 .../base/templates/pricing/adjustment.phtml   | 23 +++++-----
 .../checkout/cart/item/price/sidebar.phtml    | 18 ++++----
 .../review/item/price/row_excl_tax.phtml      | 16 +++----
 .../review/item/price/row_incl_tax.phtml      | 16 +++----
 .../review/item/price/unit_excl_tax.phtml     | 16 +++----
 .../review/item/price/unit_incl_tax.phtml     | 16 +++----
 .../templates/email/items/price/row.phtml     | 19 ++++----
 .../frontend/templates/item/price/row.phtml   | 30 ++++++-------
 .../item/price/total_after_discount.phtml     |  4 +-
 .../frontend/templates/item/price/unit.phtml  | 30 ++++++-------
 47 files changed, 275 insertions(+), 454 deletions(-)
 delete mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
 delete mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
 delete mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
 delete mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index 5e914fdc5a558..890e876cf02fc 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -16,18 +13,18 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+        <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
     </div>
 <?php endif; ?>
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
         <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
-        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
index 501ec61d34815..f8a32492a566d 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,4 +10,4 @@
 $_item = $block->getItem();
 ?>
 
-<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
index 82d82192d45e4..35ca03ffbd5af 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -16,21 +13,21 @@ $_item = $block->getItem();
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
-        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+        <?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
     </div>
 <?php endif; ?>
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
         <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
 
-        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
 
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
index 17f7f39529a74..63c55526e2417 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -15,15 +12,15 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
index 860b4662fd369..480fb84feb8cc 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -16,16 +13,16 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
index 2846307979df0..a229c0bba8340 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -15,16 +12,16 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
+    <?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
index 30b5e954da5d2..304020c3af279 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="entry-edit form-inline">
     <?= $block->getFormHtml() ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index 16c23624c38e6..4a3d20d4394f1 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <script>
 require([
@@ -13,7 +10,7 @@ require([
     "mage/adminhtml/form"
 ], function(jQuery){
 
-    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @escapeNotVerified */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
     updater.disableRegionValidation();
 
     (function ($) {
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 682968e34479b..e729a7ef3c2e3 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -3,21 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <fieldset id="tax-rate-titles-table" class="admin__fieldset">
     <?php $_labels = $block->getTitles() ?>
     <?php foreach ($block->getStores() as $_store): ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?= /* @escapeNotVerified */ $_store->getName() ?></span></label>
+            <label class="admin__field-label">
+                <span><?= $block->escapeHtml($_store->getName()) ?></span>
+            </label>
             <div class="admin__field-control">
                 <input
                     class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
                     type="text"
-                    name="title[<?= /* @escapeNotVerified */ $_store->getId() ?>]"
-                    value="<?= /* @escapeNotVerified */ $_labels[$_store->getId()] ?>" />
+                    name="title[<?= $block->escapeHtml($_store->getId()) ?>]"
+                    value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>" />
             </div>
         </div>
     <?php endforeach; ?>
@@ -25,8 +24,8 @@
     <div class="messages">
         <div class="message message-notice">
             <div>
-                <strong><?= /* @escapeNotVerified */ __('Note:') ?></strong>
-                <?= /* @escapeNotVerified */ __('Leave this field empty if you wish to use the tax identifier.') ?>
+                <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
+                <?= $block->escapeHtml(__('Leave this field empty if you wish to use the tax identifier.')) ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index fced077015f4e..a84361f7052cd 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
 ?>
 <script>
@@ -78,7 +76,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?= /* @escapeNotVerified */ $block->getTaxRateLoadUrl() ?>',
+                url: '<?= $block->escapeUrl($block->getTaxRateLoadUrl()) ?>',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -95,14 +93,14 @@ require([
                             });
                         else
                             alert({
-                                content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                        content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                     });
                 },
                 dataType: "json"
@@ -113,7 +111,7 @@ require([
             var options = {
                 mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
-                addText: '<?= /* @escapeNotVerified */ __('Add New Tax Rate') ?>',
+                addText: '<?= $block->escapeJs(__('Add New Tax Rate')) ?>',
                 parse: null,
                 nextPageUrl: '<?php echo $block->escapeHtml($block->getTaxRatesPageUrl())?>',
                 selectedValues: this.settings.selected_values,
@@ -138,7 +136,7 @@ require([
             var taxRate = $('#tax_rate'),
                 taxRateField = taxRate.parent(),
                 taxRateForm = $('#tax-rate-form'),
-                taxRateFormElement = $('#<?= /* @escapeNotVerified */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
+                taxRateFormElement = $('#<?= /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
 
             if (!this.isEntityEditable) {
                 // Override default layout of editable multiselect
@@ -162,7 +160,7 @@ require([
             taxRateField.find('.mselect-list')
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
-                        if (!confirm('<?= /* @escapeNotVerified */ __('Do you really want to delete this tax rate?') ?>')) {
+                        if (!confirm('<?= $block->escapeJs(__('Do you really want to delete this tax rate?')) ?>')) {
                             return;
                         }
 
@@ -178,7 +176,7 @@ require([
                                 form_key: $('input[name="form_key"]').val()
                             },
                             dataType: 'json',
-                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateDeleteUrl() ?>',
+                            url: '<?= $block->escapeUrl($block->getTaxRateDeleteUrl()) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -196,14 +194,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                            content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                    content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                                 });
                             }
                         };
@@ -224,15 +222,15 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?= /* @escapeNotVerified */ __('Tax Rate') ?>',
+                title: '<?= $block->escapeJs(__('Tax Rate')) ?>',
                 type: 'slide',
-                id: '<?= /* @escapeNotVerified */ $block->getJsId() ?>',
+                id: '<?= $block->escapeJs($block->getJsId()) ?>',
                 modalClass: 'tax-rate-popup',
                 closed: function () {
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '<?= /* @escapeNotVerified */ __('Save') ?>',
+                    text: '<?= $block->escapeJs(__('Save')) ?>',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -252,7 +250,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateSaveUrl() ?>',
+                            url: '<?= $block->escapeUrl($block->getTaxRateSaveUrl()) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -277,14 +275,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                            content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                    content: '<?= $block->escapeJs(__('An error occurred')) ?>'
                                 });
                             }
                         };
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index c0d185c36b0d6..6e526d06cbc1e 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,8 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline" id="<?= $block->escapeHtml($block->getNameInLayout()) ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>
-
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
deleted file mode 100644
index ed7e543989e78..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
-        <?= /* @escapeNotVerified */ __('Add New Class') ?>
-    </button>
-</div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
deleted file mode 100644
index e0255d52e4dc3..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?= $block->getBackButtonHtml() ?>
-    <?= $block->getResetButtonHtml() ?>
-    <?= $block->getSaveButtonHtml() ?>
-</div>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
-
-});
-</script>
-<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
index 902c6932f0ae1..c0928f4723b50 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 3128b82b69e60..eb446ecb092ac 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php if ($form): ?>
 <?= $form->toHtml() ?>
@@ -16,7 +13,7 @@ require([
     "mage/mage"
 ], function($){
 
-    $('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
+    $('#<?= $block->escapeHtml($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
     $(document).ready(function () {
         'use strict';
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
deleted file mode 100644
index b3d8a01e1eff1..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
-        <?= /* @escapeNotVerified */ __('Add New Tax Rule') ?>
-    </button>
-</div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
deleted file mode 100644
index 10c0e796ea4f1..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?= $block->getBackButtonHtml() ?>
-    <?= $block->getResetButtonHtml() ?>
-    <?= $block->getSaveButtonHtml() ?>
-    <?= $block->getDeleteButtonHtml() ?>
-</div>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
-
-});
-</script>
-<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index c6d3d51ff22a8..775c35d6a0d4a 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -3,18 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 
 <?php if ($block->displayBothPrices()): ?>
-    <span id="<?= /* @escapeNotVerified */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
+    <span id="<?= /* @noEscape */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
           data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"
-          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawAmount() ?>"
+          data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
           data-price-type="basePrice"
           class="price-wrapper price-excluding-tax">
-        <span class="price"><?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?></span></span>
+        <span class="price"><?= /* @noEscape */ $block->getDisplayAmountExclTax() ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index 999af81186fae..72f0bcd297d84 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 <?php if ($block->displayPriceIncludingTax()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
 <?php elseif ($block->displayPriceExcludingTax()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?>
+    <?= /* @noEscape */ $block->getDisplayAmountExclTax() ?>
 <?php elseif ($block->displayBothPrices()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
     <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
-        (+<?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?> Excl. Tax)
+        (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax'))?>)
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 9395bd47ca3e7..dfa829aac7119 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,19 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 ?>
 <?php $_item = $block->getItem() ?>
     <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
+        <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
         </span>
     <?php endif; ?>
     <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 5bcbde0e24c4e..967b6c33d537f 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -4,37 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
 <tr class="grand totals excl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
+        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
-<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
+<?= /* @noEscape */ $block->renderTotals('taxes', $block->getColspan()) ?>
 <tr class="grand totals incl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
+        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="grand totals">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 203dd72041296..c0321543b001f 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
@@ -14,37 +12,37 @@
 <?php if ($block->displayShipping()):?>
     <?php if ($block->displayBoth()):?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
+        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+            <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
+        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+            <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()) : ?>
     <tr class="totals shipping incl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php else:?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 2aedc85221344..5b1be558d4206 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -3,25 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Tax\Block\Checkout\Shipping\Price */ ?>
 
 <?php $_excl = $block->getShippingPriceExclTax(); ?>
 <?php $_incl = $block->getShippingPriceInclTax(); ?>
 <?php if ($block->displayShippingPriceExclTax()): ?>
-    <span class="price"><?= /* @escapeNotVerified */ $_excl ?></span>
+    <span class="price"><?= /* @noEscape */ $_excl ?></span>
 <?php else: ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
 <?php endif; ?>
-    <span class="price"><?= /* @escapeNotVerified */ $_incl ?></span>
+    <span class="price"><?= /* @noEscape */ $_incl ?></span>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
     </span>
 <?php endif; ?>
 <?php endif; ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><span class="price"><?= /* @escapeNotVerified */ $_excl ?></span></span>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index d295ba7bc7bbc..b7d6729215f94 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Subtotal
  * @see \Magento\Tax\Block\Checkout\Subtotal
@@ -13,28 +11,28 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="totals sub excl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
+        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
+        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="totals sub">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 50fa6c425c223..7f9a9c71604c9 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Tax
  * @see \Magento\Tax\Block\Checkout\Tax
@@ -24,16 +22,16 @@
     }
 ?>
 
-<tr <?= /* @escapeNotVerified */ $attributes ?>>
-    <th style="<?= /* @escapeNotVerified */ $_style ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+<tr <?= /* @noEscape */ $attributes ?>>
+    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <span class="detailed"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></span>
+            <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
         <?php else: ?>
-            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php endif;?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
+    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
     </td>
 </tr>
 
@@ -48,17 +46,17 @@
         <?php $isFirst = 1; ?>
 
         <?php foreach ($rates as $rate): ?>
-            <tr class="totals-tax-details details-<?= /* @escapeNotVerified */ $taxIter ?>">
-                <th class="mark" style="<?= /* @escapeNotVerified */ $_style ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+            <tr class="totals-tax-details details-<?= /* @noEscape */ $taxIter ?>">
+                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
                     <?php if (!is_null($rate['percent'])): ?>
                         (<?= (float)$rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
                 <?php if ($isFirst): ?>
-                    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
+                    <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
                        data-th="<?= $block->escapeHtml($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
-                        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
+                        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
index bd6841268d509..88088ed5b503d 100644
--- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
@@ -17,16 +14,16 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($_incl) ?>
+    <?= /* @noEscape */ $_order->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 856909cbb4240..a667e3b48bfae 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
@@ -13,7 +11,7 @@ $_item = $block->getItem();
 <?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
@@ -21,7 +19,7 @@ $_item = $block->getItem();
 <?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
index f0066d9024139..3356c2514c20f 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
@@ -4,10 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index 5fd1fed49c33c..9b6aedab15267 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
@@ -15,7 +13,7 @@ $_item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+            <?= /* @noEscape */ $block->formatPrice($_incl) ?>
         </span>
     </span>
 <?php endif; ?>
@@ -23,7 +21,7 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index b329f00973b5a..e1965905556ab 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
     $_order  = $block->getOrder();
@@ -22,16 +19,16 @@
                 $baseAmount = $info['base_tax_amount'];
                 $title      = $info['title'];
             ?>
-            <tr class="totals tax details details-<?= /* @escapeNotVerified */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
-                <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
+            <tr class="totals tax details details-<?= /* @noEscape */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
+                <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if (!is_null($percent)): ?>
                         (<?= (float)$percent ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
-                <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> rowspan="1">
-                    <?= /* @escapeNotVerified */ $_order->formatPrice($amount) ?>
+                <td <?= /* @noEscape */ $block->getValueProperties() ?> rowspan="1">
+                    <?= /* @noEscape */ $_order->formatPrice($amount) ?>
                 </td>
             </tr>
         <?php endforeach; ?>
@@ -44,14 +41,14 @@
 <?php else: ?>
 <tr class="totals-tax">
 <?php endif; ?>
-    <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
+    <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
         <?php if ($block->displayFullSummary()): ?>
-            <div class="detailed"><?= /* @escapeNotVerified */ __('Tax') ?></div>
+            <div class="detailed"><?= $block->escapeHtml(__('Tax')) ?></div>
         <?php else: ?>
-            <?= /* @escapeNotVerified */ __('Tax') ?>
+            <?= $block->escapeHtml(__('Tax')) ?>
         <?php endif;?>
     </th>
-    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
-        <?= /* @escapeNotVerified */ $_order->formatPrice($_source->getTaxAmount()) ?>
+    <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
+        <?= /* @noEscape */ $_order->formatPrice($_source->getTaxAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index ea35eff438c0d..6e968a47306c8 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
@@ -19,7 +16,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getRowPriceExclTaxHtml() ?>
@@ -28,14 +25,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
+                        <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
@@ -45,7 +42,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getRowPriceInclTaxHtml() ?>
 
@@ -54,14 +51,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
+                        <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
index fa55009fb5b6f..b0f29e2f03def 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,4 +10,4 @@
 $_item = $block->getItem();
 ?>
 
-<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index 13eca4afd2e8e..7802028860502 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
@@ -19,7 +16,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getUnitPriceExclTaxHtml() ?>
@@ -29,14 +26,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
+                        <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
@@ -46,7 +43,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getUnitPriceInclTaxHtml() ?>
 
@@ -55,14 +52,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
+                        <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index d9bd79e65a153..f3222ae68e79d 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
@@ -15,9 +12,9 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
@@ -25,15 +22,15 @@ $_item = $block->getItem();
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -41,22 +38,22 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
index bda7b807c6094..c3c8547510ee7 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
@@ -17,9 +14,9 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
@@ -27,15 +24,15 @@ $_item = $block->getItem();
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -44,23 +41,23 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_incl)) ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_incl)) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
index d56e0fc3ebb3f..6b0cc43af95f5 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
@@ -15,24 +12,24 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -41,23 +38,23 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
+                    <span class="nobr"><?= $block->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"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 01ecaca435d15..f3b02fba936a3 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Renderer\Weee\Tax */
@@ -20,16 +17,16 @@ $data = ['fptAttribute' => [
 <div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
      data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
      data-mage-init="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)) ?>">
-    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
+    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
     <div class="control">
         <table class="data-table">
             <thead>
                 <tr>
-                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= /* @escapeNotVerified */ __('Website') ?></th>
-                    <th class="col-country required"><?= /* @escapeNotVerified */ __('Country/State') ?></th>
-                    <th class="col-tax required"><?= /* @escapeNotVerified */ __('Tax') ?></th>
-                    <th class="col-action"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
+                    <th class="col-country required"><?= $block->escapeHtml(__('Country/State')) ?></th>
+                    <th class="col-tax required"><?= $block->escapeHtml(__('Tax')) ?></th>
+                    <th class="col-action"><?= $block->escapeHtml(__('Action')) ?></th>
                 </tr>
             </thead>
             <tfoot>
@@ -44,41 +41,41 @@ $data = ['fptAttribute' => [
             Hidden field below with attribute code id is necessary for jQuery validation plugin.
             Validation message will be displayed after this field.
         -->
-        <input type="hidden" name="<?= $block->getElement()->getHtmlId() ?>" id="<?= $block->getElement()->getHtmlId() ?>" disabled="disabled">
+        <input type="hidden" name="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" disabled="disabled">
     </div>
 
     <script data-role="row-template" type="text/x-magento-template">
         <tr id="<?= $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
             <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_website"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
+                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_website"
+                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][website_id]"
+                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> website required-entry" data-role="select-website">
                     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= /* @escapeNotVerified */ $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?= /* @escapeNotVerified */ $_info['currency'] ?>]<?php endif; ?></option>
+                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])): ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
             <td class="col-country">
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][country]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> country required-entry" data-role="select-country">
+                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_country"
+                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][country]"
+                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> country required-entry" data-role="select-country">
                     <?php foreach ($block->getCountries() as $_country): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_country['value'] ?>"><?= /* @escapeNotVerified */ htmlspecialchars($_country['label']) ?></option>
+                    <option value="<?= $block->escapeHtml($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][state]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
+                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_state"
+                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][state]"
+                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> state" disabled="" data-role="select-state">
                     <option value="0">*</option>
                 </select>
             </td>
             <td class="col-tax">
-                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][price]"
-                       class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
+                <input name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][price]"
+                       class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> required-entry validate-greater-than-zero"
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <input name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
                 <?= $block->getChildHtml('delete_button') ?>
             </td>
         </tr>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index c05d48cab6a43..5e0510bbcfd16 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -23,22 +20,22 @@ $priceDisplay = $block->isPriceIncludesTax();
         <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute)) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute)) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Incl. Tax' ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' ' . __('Incl. Tax')) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Excl. Tax' ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' ' . __('Excl. Tax')) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php endif; ?>
     <?php endforeach; ?>
 <?php endif; ?>
@@ -46,6 +43,6 @@ $priceDisplay = $block->isPriceIncludesTax();
 <?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
-          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawFinalAmount() ?>"
-          data-label="<?= /* @escapeNotVerified */ __('Final Price') ?>"><?= /* @escapeNotVerified */ $block->getFinalAmount() ?></span>
+          data-price-amount="<?= /* @noEscape */ $block->getRawFinalAmount() ?>"
+          data-label="<?= $block->escapeHtml(__('Final Price')) ?>"><?= /* @noEscape */ $block->getFinalAmount() ?></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 9c7a77c54a373..2204add57b4c8 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
@@ -22,15 +20,15 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
     <?php else: ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
         </span>
 
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
+                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
@@ -38,7 +36,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -54,15 +52,15 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
     <?php else: ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
         </span>
 
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
+                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
@@ -70,7 +68,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index bc63a5eff642b..6761c332ea960 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -4,33 +4,31 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
+            <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index a85904e197bfb..f8d72e6eab6df 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
@@ -14,26 +12,26 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
+                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index dc1d22ff3b0dd..a243609d796f7 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -4,34 +4,32 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display:none;">
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display:none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span>
+            <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 3b7c2f530d3be..1f5fad501edc5 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
@@ -14,27 +12,27 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
+                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index bd0eefd9d2b98..0b3b4b7ca5c1d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
@@ -20,23 +17,23 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
+        <span class="label"><?=  $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?= /* @escapeNotVerified */  __('Total') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
+            <span class="nobr"><?=  $block->escapeHtml(__('Total')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
@@ -44,21 +41,21 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?=  $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= /* @escapeNotVerified */  __('Total Incl. Tax') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
+            <span class="nobr"><?=  $block->escapeHtml(__('Total Incl. Tax')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index dc128902ef4d2..f645e67ec62e5 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
@@ -14,27 +12,27 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -46,28 +44,28 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+                <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
index 03c050e0a0b04..46d16ad13ea6e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
@@ -4,10 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 575a0dd6c9aa8..5dc268c325074 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
@@ -14,27 +12,27 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
+            <span class="cart-tax-info" id="unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -46,28 +44,28 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+                <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>

From b091b925c07199f35ffa99eef44473407d558ecd Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Tue, 14 May 2019 12:57:57 -0500
Subject: [PATCH 02/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../view/adminhtml/templates/rate/title.phtml |  2 +-
 .../view/adminhtml/templates/rule/edit.phtml  | 26 +++++++++----------
 .../adminhtml/templates/renderer/tax.phtml    |  2 +-
 .../review/item/price/row_excl_tax.phtml      |  6 ++---
 .../review/item/price/row_incl_tax.phtml      |  6 ++---
 .../review/item/price/unit_excl_tax.phtml     |  6 ++---
 .../review/item/price/unit_incl_tax.phtml     |  6 ++---
 .../frontend/templates/item/price/row.phtml   | 12 ++++-----
 .../frontend/templates/item/price/unit.phtml  | 12 ++++-----
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index e729a7ef3c2e3..347923dfff773 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -15,7 +15,7 @@
                 <input
                     class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
                     type="text"
-                    name="title[<?= $block->escapeHtml($_store->getId()) ?>]"
+                    name="title[<?= (int)$_store->getId() ?>]"
                     value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>" />
             </div>
         </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index a84361f7052cd..3edf5a7736c6e 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -76,7 +76,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?= $block->escapeUrl($block->getTaxRateLoadUrl()) ?>',
+                url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateLoadUrl())) ?>',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -93,14 +93,14 @@ require([
                             });
                         else
                             alert({
-                                content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                                content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                        content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                     });
                 },
                 dataType: "json"
@@ -111,7 +111,7 @@ require([
             var options = {
                 mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
-                addText: '<?= $block->escapeJs(__('Add New Tax Rate')) ?>',
+                addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
                 parse: null,
                 nextPageUrl: '<?php echo $block->escapeHtml($block->getTaxRatesPageUrl())?>',
                 selectedValues: this.settings.selected_values,
@@ -176,7 +176,7 @@ require([
                                 form_key: $('input[name="form_key"]').val()
                             },
                             dataType: 'json',
-                            url: '<?= $block->escapeUrl($block->getTaxRateDeleteUrl()) ?>',
+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateDeleteUrl())) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -194,14 +194,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                 });
                             }
                         };
@@ -222,15 +222,15 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?= $block->escapeJs(__('Tax Rate')) ?>',
+                title: '<?= $block->escapeJs($block->escapeHtml(__('Tax Rate'))) ?>',
                 type: 'slide',
-                id: '<?= $block->escapeJs($block->getJsId()) ?>',
+                id: '<?= /* @noEscape */ $block->getJsId() ?>',
                 modalClass: 'tax-rate-popup',
                 closed: function () {
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '<?= $block->escapeJs(__('Save')) ?>',
+                    text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -250,7 +250,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?= $block->escapeUrl($block->getTaxRateSaveUrl()) ?>',
+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateSaveUrl())) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -275,14 +275,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= $block->escapeJs(__('An error occurred')) ?>'
+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                 });
                             }
                         };
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index f3b02fba936a3..b834c99a3bce1 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -16,7 +16,7 @@ $data = ['fptAttribute' => [
 ?>
 <div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
      data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
-     data-mage-init="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)) ?>">
+     data-mage-init="<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>">
     <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
     <div class="control">
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index 6761c332ea960..70066211b320e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -9,7 +9,7 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -17,7 +17,7 @@ $_item = $block->getItem();
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
             <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
@@ -26,7 +26,7 @@ $_item = $block->getItem();
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index f8d72e6eab6df..8de3696092bf6 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -12,7 +12,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -20,7 +20,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
                 <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
@@ -29,7 +29,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index a243609d796f7..5aafda7e7d9b4 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -9,7 +9,7 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -18,7 +18,7 @@ $_item = $block->getItem();
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display:none;">
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$_item->getId() ?>" style="display:none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
             <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
@@ -27,7 +27,7 @@ $_item = $block->getItem();
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 1f5fad501edc5..3b33066bc3c28 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -12,7 +12,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -21,7 +21,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>" style="display: none;">
+    <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
                 <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
@@ -30,7 +30,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($_item->getId()) ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index f645e67ec62e5..a3baea35e1211 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -12,7 +12,7 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -20,7 +20,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>" style="display: none;">
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
@@ -30,7 +30,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
@@ -44,7 +44,7 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -52,7 +52,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
@@ -63,7 +63,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 5dc268c325074..9e61515783dd1 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -12,7 +12,7 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -20,7 +20,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>" style="display: none;">
+            <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
@@ -30,7 +30,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
@@ -44,7 +44,7 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -52,7 +52,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
@@ -63,7 +63,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= $block->escapeHtml($item->getId()) ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>

From 6974929e7997b923b36f7844c77a5bb9b4cb8879 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Wed, 15 May 2019 12:53:57 -0500
Subject: [PATCH 03/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../view/adminhtml/templates/rate/title.phtml |  2 +-
 .../adminhtml/templates/rule/rate/form.phtml  |  2 +-
 .../base/templates/pricing/adjustment.phtml   |  2 +-
 .../checkout/cart/item/price/sidebar.phtml    |  4 +--
 .../templates/checkout/grandtotal.phtml       | 18 ++++++----
 .../templates/checkout/shipping.phtml         | 20 ++++++-----
 .../templates/checkout/shipping/price.phtml   |  4 +--
 .../templates/checkout/subtotal.phtml         | 18 ++++++----
 .../frontend/templates/checkout/tax.phtml     | 10 +++---
 .../frontend/templates/item/price/row.phtml   |  4 +--
 .../frontend/templates/item/price/unit.phtml  |  5 ++-
 .../view/frontend/templates/order/tax.phtml   |  2 +-
 .../adminhtml/templates/renderer/tax.phtml    | 36 ++++++++++---------
 .../base/templates/pricing/adjustment.phtml   | 13 ++++---
 .../checkout/cart/item/price/sidebar.phtml    | 12 +++----
 .../review/item/price/row_excl_tax.phtml      |  4 +--
 .../review/item/price/row_incl_tax.phtml      |  4 +--
 .../review/item/price/unit_excl_tax.phtml     |  4 +--
 .../review/item/price/unit_incl_tax.phtml     |  4 +--
 .../frontend/templates/item/price/row.phtml   | 12 +++----
 .../frontend/templates/item/price/unit.phtml  | 12 +++----
 .../_files/whitelist/exempt_modules/ce.php    |  2 --
 22 files changed, 105 insertions(+), 89 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 347923dfff773..e63398f32a26a 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -16,7 +16,7 @@
                     class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
                     type="text"
                     name="title[<?= (int)$_store->getId() ?>]"
-                    value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>" />
+                    value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>" />
             </div>
         </div>
     <?php endforeach; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index 6e526d06cbc1e..f09af05303f36 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,7 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= $block->escapeHtml($block->getNameInLayout()) ?>" style="display:none">
+<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index 775c35d6a0d4a..c49cd989ddd88 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -9,7 +9,7 @@
 
 <?php if ($block->displayBothPrices()): ?>
     <span id="<?= /* @noEscape */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
-          data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"
+          data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
           data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
           data-price-type="basePrice"
           class="price-wrapper price-excluding-tax">
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index dfa829aac7119..a4181e7918b40 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -8,13 +8,13 @@
 ?>
 <?php $_item = $block->getItem() ?>
     <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+        <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
         </span>
     <?php endif; ?>
     <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+        <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 967b6c33d537f..3106ef4f4693b 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -9,29 +9,33 @@
  */
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
+<?php
+    $style = $block->escapeHtmlAttr($block->getStyle());
+    $colspan = (int)$block->getColspan();
+?>
 <tr class="grand totals excl">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
         <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
-<?= /* @noEscape */ $block->renderTotals('taxes', $block->getColspan()) ?>
+<?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
 <tr class="grand totals incl">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
         <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="grand totals">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
         <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index c0321543b001f..b0cdec6d4643a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -10,38 +10,42 @@
  */
 ?>
 <?php if ($block->displayShipping()):?>
+<?php
+    $style = $block->escapeHtmlAttr($block->getStyle());
+    $colspan = (int)$block->getColspan();
+?>
     <?php if ($block->displayBoth()):?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
-        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()) : ?>
     <tr class="totals shipping incl">
-        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php else:?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
             <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 5b1be558d4206..af9cf4cf6db45 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -12,7 +12,7 @@
     <span class="price"><?= /* @noEscape */ $_excl ?></span>
 <?php else: ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
 <?php endif; ?>
     <span class="price"><?= /* @noEscape */ $_incl ?></span>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
@@ -20,5 +20,5 @@
 <?php endif; ?>
 <?php endif; ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index b7d6729215f94..1e25ff1aec6a6 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -9,29 +9,33 @@
  * @see \Magento\Tax\Block\Checkout\Subtotal
  */
 ?>
-<?php if ($block->displayBoth()):?>
+<?php if ($block->displayBoth()) :?>
+<?php
+    $style = $block->escapeHtmlAttr($block->getStyle());
+    $colspan = (int)$block->getColspan();
+?>
 <tr class="totals sub excl">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
         <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
         <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="totals sub">
-    <th style="<?= /* @noEscape */ $block->getStyle() ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
-    <td style="<?= /* @noEscape */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
         <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 7f9a9c71604c9..88d083cf0a563 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -11,7 +11,7 @@
 ?>
 <?php
     $_value = $block->getTotal()->getValue();
-    $_style = $block->getTotal()->getStyle();
+    $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
 ?>
 <?php global $taxIter; $taxIter++; ?>
 
@@ -23,14 +23,14 @@
 ?>
 
 <tr <?= /* @noEscape */ $attributes ?>>
-    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int)$block->getColspan() ?>" scope="row">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
         <?php else: ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php endif;?>
     </th>
-    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
         <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
     </td>
 </tr>
@@ -47,7 +47,7 @@
 
         <?php foreach ($rates as $rate): ?>
             <tr class="totals-tax-details details-<?= /* @noEscape */ $taxIter ?>">
-                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= /* @noEscape */ $block->getColspan() ?>" scope="row">
+                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int)$block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
                     <?php if (!is_null($rate['percent'])): ?>
                         (<?= (float)$rate['percent'] ?>%)
@@ -55,7 +55,7 @@
                 </th>
                 <?php if ($isFirst): ?>
                     <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-                       data-th="<?= $block->escapeHtml($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
                         <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index a667e3b48bfae..f9444d025d56a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -9,7 +9,7 @@
 $_item = $block->getItem();
 ?>
 <?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
         </span>
@@ -17,7 +17,7 @@ $_item = $block->getItem();
 <?php endif; ?>
 
 <?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
         </span>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index 9b6aedab15267..e672ad64ba874 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -8,9 +8,8 @@
 
 $_item = $block->getItem();
 ?>
-
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($_incl) ?>
@@ -19,7 +18,7 @@ $_item = $block->getItem();
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
         </span>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index e1965905556ab..da3f7a9f9134c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -48,7 +48,7 @@
             <?= $block->escapeHtml(__('Tax')) ?>
         <?php endif;?>
     </th>
-    <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
+    <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr(__('Tax')) ?>">
         <?= /* @noEscape */ $_order->formatPrice($_source->getTaxAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index b834c99a3bce1..097cbc8d36b9b 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -14,8 +14,8 @@ $data = ['fptAttribute' => [
     'bundlePriceType' => '#price_type',
 ]];
 ?>
-<div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
-     data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
+<div id="attribute-<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>-container" class="field"
+     data-attribute-code="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
      data-mage-init="<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>">
     <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
@@ -45,37 +45,41 @@ $data = ['fptAttribute' => [
     </div>
 
     <script data-role="row-template" type="text/x-magento-template">
-        <tr id="<?= $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
+        <?php
+            $elementName = $block->escapeHtmlAttr($block->getElement()->getName());
+            $elementClass = $block->escapeHtmlAttr($block->getElement()->getClass());
+        ?>
+        <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
             <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
-                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_website"
-                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][website_id]"
-                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> website required-entry" data-role="select-website">
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_website"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][website_id]"
+                        class="<?= /* @noEscape */ $elementClass ?> website required-entry" data-role="select-website">
                     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
                     <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])): ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
             <td class="col-country">
-                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_country"
-                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][country]"
-                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> country required-entry" data-role="select-country">
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_country"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][country]"
+                        class="<?= /* @noEscape */ $elementClass ?> country required-entry" data-role="select-country">
                     <?php foreach ($block->getCountries() as $_country): ?>
-                    <option value="<?= $block->escapeHtml($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
+                    <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
-                <select id="<?= $block->escapeHtml($block->getElement()->getName()) ?>_weee_tax_row_<%- data.index %>_state"
-                        name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][state]"
-                        class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> state" disabled="" data-role="select-state">
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_state"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][state]"
+                        class="<?= /* @noEscape */ $elementClass ?> state" disabled="" data-role="select-state">
                     <option value="0">*</option>
                 </select>
             </td>
             <td class="col-tax">
-                <input name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][price]"
-                       class="<?= $block->escapeHtml($block->getElement()->getClass()) ?> required-entry validate-greater-than-zero"
+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][price]"
+                       class="<?= /* @noEscape */ $elementClass ?> required-entry validate-greater-than-zero"
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?= $block->escapeHtml($block->getElement()->getName()) ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
                 <?= $block->getChildHtml('delete_button') ?>
             </td>
         </tr>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index 5e0510bbcfd16..01f003246e8f9 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -17,24 +17,27 @@ $priceDisplay = $block->isPriceIncludesTax();
 
 <?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final ?>
     <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
+        <?php
+            $attributeName = $block->escapeHtmlAttr($block->renderWeeeTaxAttributeName($weeeTaxAttribute));
+        ?>
         <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute)) ?>">
+                  data-label="<?= /* @noEscape */ $attributeName ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute)) ?>">
+                  data-label="<?= /* @noEscape */ $attributeName ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' ' . __('Incl. Tax')) ?>">
+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= $block->escapeHtml($block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' ' . __('Excl. Tax')) ?>">
+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php endif; ?>
     <?php endforeach; ?>
@@ -44,5 +47,5 @@ $priceDisplay = $block->isPriceIncludesTax();
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
           data-price-amount="<?= /* @noEscape */ $block->getRawFinalAmount() ?>"
-          data-label="<?= $block->escapeHtml(__('Final Price')) ?>"><?= /* @noEscape */ $block->getFinalAmount() ?></span>
+          data-label="<?= $block->escapeHtmlAttr(__('Final Price')) ?>"><?= /* @noEscape */ $block->getFinalAmount() ?></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 2204add57b4c8..8bb545d0f535e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -14,7 +14,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <span class="minicart-tax-total">
     <?php else: ?>
@@ -27,7 +27,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                     <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                 </span>
             <?php endforeach; ?>
@@ -35,7 +35,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
@@ -46,7 +46,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <span class="minicart-tax-total">
     <?php else: ?>
@@ -59,7 +59,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                     <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                 </span>
             <?php endforeach; ?>
@@ -67,7 +67,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index 70066211b320e..ad98039519cea 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -20,14 +20,14 @@ $_item = $block->getItem();
     <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index 8de3696092bf6..e0513f522a770 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -23,14 +23,14 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index 5aafda7e7d9b4..cf2693842b8d3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -21,14 +21,14 @@ $_item = $block->getItem();
     <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$_item->getId() ?>" style="display:none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 3b33066bc3c28..b4389dea160c3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -24,14 +24,14 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
     <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index a3baea35e1211..c78cb30dd9d56 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -9,7 +9,7 @@
 $item = $block->getItem();
 ?>
 <?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
@@ -22,7 +22,7 @@ $item = $block->getItem();
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
@@ -31,7 +31,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                     data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
                 </span>
@@ -41,7 +41,7 @@ $item = $block->getItem();
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
@@ -55,7 +55,7 @@ $item = $block->getItem();
             <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
@@ -64,7 +64,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                       data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
                 </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 9e61515783dd1..5b50c82255b3a 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -9,7 +9,7 @@
 $item = $block->getItem();
 ?>
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
@@ -22,7 +22,7 @@ $item = $block->getItem();
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
@@ -31,7 +31,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                     data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
@@ -41,7 +41,7 @@ $item = $block->getItem();
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
@@ -55,7 +55,7 @@ $item = $block->getItem();
             <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= $block->escapeHtml($tax['title']) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
@@ -64,7 +64,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                       data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
index 0d99320b15e7f..5e39e37286fe1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
@@ -41,11 +41,9 @@
     'Magento_Store',
     'Magento_Swagger',
     'Magento_Swatches',
-    'Magento_Tax',
     'Magento_TaxImportExport',
     'Magento_Theme',
     'Magento_Translation',
     'Magento_Ui',
     'Magento_User',
-    'Magento_Weee',
 ];

From b5d85e1ee1854b16b4d42e93506f4e1c8197b443 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Wed, 15 May 2019 15:57:16 -0500
Subject: [PATCH 04/10] MAGETWO-99667: Fix Unrelated Static Test Failures

---
 .../adminhtml/templates/items/price/row.phtml | 15 +++--
 .../templates/items/price/unit.phtml          | 14 ++--
 .../order/create/items/price/row.phtml        | 12 ++--
 .../order/create/items/price/total.phtml      |  8 +--
 .../order/create/items/price/unit.phtml       | 12 ++--
 .../view/adminhtml/templates/rate/js.phtml    |  4 +-
 .../view/adminhtml/templates/rate/title.phtml |  4 +-
 .../view/adminhtml/templates/rule/edit.phtml  |  2 +-
 .../templates/toolbar/rate/save.phtml         | 59 +++++++++--------
 .../base/templates/pricing/adjustment.phtml   |  2 +-
 .../templates/pricing/adjustment/bundle.phtml |  8 +--
 .../checkout/cart/item/price/sidebar.phtml    | 10 +--
 .../templates/checkout/grandtotal.phtml       | 64 ++++++++++---------
 .../templates/checkout/shipping.phtml         | 24 +++----
 .../templates/checkout/shipping/price.phtml   | 18 +++---
 .../templates/checkout/subtotal.phtml         | 18 +++---
 .../frontend/templates/checkout/tax.phtml     | 38 ++++++-----
 .../templates/email/items/price/row.phtml     | 12 ++--
 .../frontend/templates/item/price/row.phtml   |  4 +-
 .../frontend/templates/item/price/unit.phtml  |  4 +-
 .../view/frontend/templates/order/tax.phtml   | 23 +++----
 .../adminhtml/templates/items/price/row.phtml | 28 ++++----
 .../templates/items/price/unit.phtml          | 28 ++++----
 .../order/create/items/price/row.phtml        | 26 ++++----
 .../order/create/items/price/total.phtml      | 29 +++++----
 .../order/create/items/price/unit.phtml       | 26 ++++----
 .../adminhtml/templates/renderer/tax.phtml    | 18 +++---
 .../base/templates/pricing/adjustment.phtml   | 12 ++--
 .../checkout/cart/item/price/sidebar.phtml    | 30 +++++----
 .../review/item/price/row_excl_tax.phtml      | 14 ++--
 .../review/item/price/row_incl_tax.phtml      | 16 +++--
 .../review/item/price/unit_excl_tax.phtml     | 15 +++--
 .../review/item/price/unit_incl_tax.phtml     | 16 +++--
 .../templates/email/items/price/row.phtml     | 28 ++++----
 .../frontend/templates/item/price/row.phtml   | 26 ++++----
 .../frontend/templates/item/price/unit.phtml  | 26 ++++----
 36 files changed, 368 insertions(+), 325 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index 890e876cf02fc..e6de067a4de64 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -3,28 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
-
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(('Incl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBaseSubtotalInclTax($_item); ?>
         <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
index 35ca03ffbd5af..817a6264e5eae 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -10,22 +12,22 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
     </div>
 <?php endif; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBasePriceInclTax($_item); ?>
 
         <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
 
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
index 63c55526e2417..eeaf769542033 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -10,17 +12,17 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices($block->getStore())): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
     <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
index 480fb84feb8cc..462a1a65f97c3 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -10,17 +10,17 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
-    <?php if ($block->displayBothPrices()): ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices($block->getStore())): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
index a229c0bba8340..066b6a04fded4 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -10,18 +12,18 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
     <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index 4a3d20d4394f1..fec108d53948f 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <script>
 require([
@@ -10,7 +12,7 @@ require([
     "mage/adminhtml/form"
 ], function(jQuery){
 
-    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>, 'disable');
     updater.disableRegionValidation();
 
     (function ($) {
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index e63398f32a26a..3d6d3d19dc314 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -6,14 +6,14 @@
 ?>
 <fieldset id="tax-rate-titles-table" class="admin__fieldset">
     <?php $_labels = $block->getTitles() ?>
-    <?php foreach ($block->getStores() as $_store): ?>
+    <?php foreach ($block->getStores() as $_store) : ?>
         <div class="admin__field">
             <label class="admin__field-label">
                 <span><?= $block->escapeHtml($_store->getName()) ?></span>
             </label>
             <div class="admin__field-control">
                 <input
-                    class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
+                    class="admin__control-text<?php if ($_store->getId() == 0) : ?> required-entry<?php endif; ?>"
                     type="text"
                     name="title[<?= (int)$_store->getId() ?>]"
                     value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>" />
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 3edf5a7736c6e..1ad16feef9690 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -113,7 +113,7 @@ require([
                 toggleAddButton:false,
                 addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
                 parse: null,
-                nextPageUrl: '<?php echo $block->escapeHtml($block->getTaxRatesPageUrl())?>',
+                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl())?>',
                 selectedValues: this.settings.selected_values,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index eb446ecb092ac..5e3ef15da5482 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -4,44 +4,43 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require([
+        "jquery",
+        "mage/mage"
+    ], function($){
 
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
+        $('#<?= $block->escapeHtml($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
-    $('#<?= $block->escapeHtml($form->getForm()->getId()) ?>').mage('form').mage('validation');
+        $(document).ready(function () {
+            'use strict';
 
-    $(document).ready(function () {
-        'use strict';
+            $('.field-zip_from').addClass('ignore-validate');
+            $('.field-zip_to').addClass('ignore-validate');
 
-        $('.field-zip_from').addClass('ignore-validate');
-        $('.field-zip_to').addClass('ignore-validate');
+            $('#zip_is_range').on('change.zipRange', function(){
 
-        $('#zip_is_range').on('change.zipRange', function(){
+                var elem = $(this),
+                    zipFrom =$('.field-zip_from'),
+                    zipTo =$('.field-zip_to'),
+                    zipCode =$('.field-tax_postcode');
 
-            var elem = $(this),
-                zipFrom =$('.field-zip_from'),
-                zipTo =$('.field-zip_to'),
-                zipCode =$('.field-tax_postcode');
+                if (elem.is(':checked')) {
+                    zipCode.addClass('hidden').addClass('ignore-validate');
+                    zipFrom.removeClass('hidden').removeClass('ignore-validate');
+                    zipTo.removeClass('hidden').removeClass('ignore-validate');
 
-            if (elem.is(':checked')) {
-                zipCode.addClass('hidden').addClass('ignore-validate');
-                zipFrom.removeClass('hidden').removeClass('ignore-validate');
-                zipTo.removeClass('hidden').removeClass('ignore-validate');
-
-            } else {
-                zipCode.removeClass('hidden').removeClass('ignore-validate');
-                zipFrom.addClass('hidden').addClass('ignore-validate');
-                zipTo.addClass('hidden').addClass('ignore-validate');
-            }
+                } else {
+                    zipCode.removeClass('hidden').removeClass('ignore-validate');
+                    zipFrom.addClass('hidden').addClass('ignore-validate');
+                    zipTo.addClass('hidden').addClass('ignore-validate');
+                }
 
+            });
         });
-    });
 
-});
-</script>
+    });
+    </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index c49cd989ddd88..3eba15da887a4 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -7,7 +7,7 @@
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 
-<?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayBothPrices()) : ?>
     <span id="<?= /* @noEscape */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
           data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
           data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index 72f0bcd297d84..9e60dc983e3ac 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -6,13 +6,13 @@
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
-<?php if ($block->displayPriceIncludingTax()): ?>
+<?php if ($block->displayPriceIncludingTax()) : ?>
     <?= /* @noEscape */ $block->getDisplayAmount() ?>
-<?php elseif ($block->displayPriceExcludingTax()): ?>
+<?php elseif ($block->displayPriceExcludingTax()) : ?>
     <?= /* @noEscape */ $block->getDisplayAmountExclTax() ?>
-<?php elseif ($block->displayBothPrices()): ?>
+<?php elseif ($block->displayBothPrices()) : ?>
     <?= /* @noEscape */ $block->getDisplayAmount() ?>
-    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
+    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()) : ?>
         (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax'))?>)
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index a4181e7918b40..74db5c24aecd0 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,17 +4,19 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 ?>
 <?php $_item = $block->getItem() ?>
-    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
+    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
         <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_incl) ?>
         </span>
     <?php endif; ?>
-    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
         <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()) ?>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 3106ef4f4693b..94814c5156610 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -4,39 +4,41 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
-<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
-<?php
-    $style = $block->escapeHtmlAttr($block->getStyle());
-    $colspan = (int)$block->getColspan();
-?>
-<tr class="grand totals excl">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
-    </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
-        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
-    </td>
-</tr>
-<?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
-<tr class="grand totals incl">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
-    </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
-        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php else:?>
-<tr class="grand totals">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
-    </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <strong><?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
+    <?php
+        $style = $block->escapeHtmlAttr($block->getStyle());
+        $colspan = (int)$block->getColspan();
+    ?>
+    <tr class="grand totals excl">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotalExclTax()) ?></strong>
+        </td>
+    </tr>
+    <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
+    <tr class="grand totals incl">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
+<?php else : ?>
+    <tr class="grand totals">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index b0cdec6d4643a..ffbb33487136d 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -4,23 +4,25 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
  */
 ?>
-<?php if ($block->displayShipping()):?>
-<?php
-    $style = $block->escapeHtmlAttr($block->getStyle());
-    $colspan = (int)$block->getColspan();
-?>
-    <?php if ($block->displayBoth()):?>
+<?php if ($block->displayShipping()) : ?>
+    <?php
+        $style = $block->escapeHtmlAttr($block->getStyle());
+        $colspan = (int)$block->getColspan();
+    ?>
+    <?php if ($block->displayBoth()) : ?>
     <tr class="totals shipping excl">
         <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
         </th>
         <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
@@ -28,7 +30,7 @@
             <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
         <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()) : ?>
@@ -37,16 +39,16 @@
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
         <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
-    <?php else:?>
+    <?php else :?>
     <tr class="totals shipping excl">
         <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
         <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index af9cf4cf6db45..6c91f8cec2dce 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -8,17 +8,17 @@
 
 <?php $_excl = $block->getShippingPriceExclTax(); ?>
 <?php $_incl = $block->getShippingPriceInclTax(); ?>
-<?php if ($block->displayShippingPriceExclTax()): ?>
+<?php if ($block->displayShippingPriceExclTax()) : ?>
     <span class="price"><?= /* @noEscape */ $_excl ?></span>
-<?php else: ?>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-<?php endif; ?>
+<?php else : ?>
+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
+        <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+    <?php endif; ?>
     <span class="price"><?= /* @noEscape */ $_incl ?></span>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    </span>
-<?php endif; ?>
+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
+        </span>
+    <?php endif; ?>
 <?php endif; ?>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
+<?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 1e25ff1aec6a6..1dd3570f1c6f2 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -4,22 +4,24 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /**
  * @var $block \Magento\Tax\Block\Checkout\Subtotal
  * @see \Magento\Tax\Block\Checkout\Subtotal
  */
 ?>
-<?php if ($block->displayBoth()) :?>
-<?php
-    $style = $block->escapeHtmlAttr($block->getStyle());
-    $colspan = (int)$block->getColspan();
-?>
+<?php if ($block->displayBoth()) : ?>
+    <?php
+        $style = $block->escapeHtmlAttr($block->getStyle());
+        $colspan = (int)$block->getColspan();
+    ?>
 <tr class="totals sub excl">
     <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
     <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
-        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
@@ -27,7 +29,7 @@
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
     <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
-        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
@@ -36,7 +38,7 @@
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
     <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 88d083cf0a563..01dbeb68a0344 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /**
  * @var $block \Magento\Tax\Block\Checkout\Tax
  * @see \Magento\Tax\Block\Checkout\Tax
@@ -12,51 +14,47 @@
 <?php
     $_value = $block->getTotal()->getValue();
     $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
-?>
-<?php global $taxIter; $taxIter++; ?>
 
-<?php
     $attributes = 'class="totals-tax"';
-    if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0) {
-        $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
-    }
+
+if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) {
+    $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
+}
 ?>
 
 <tr <?= /* @noEscape */ $attributes ?>>
     <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int)$block->getColspan() ?>" scope="row">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
-        <?php else: ?>
+        <?php else : ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php endif;?>
     </th>
     <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_value) ?>
     </td>
 </tr>
 
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
-        <?php if (isset($info['hidden']) && $info['hidden']) {
-            continue;
-        } ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) : ?>
+    <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
+        <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
         <?php $percent = $info['percent']; ?>
         <?php $amount = $info['amount']; ?>
         <?php $rates = $info['rates']; ?>
         <?php $isFirst = 1; ?>
 
-        <?php foreach ($rates as $rate): ?>
-            <tr class="totals-tax-details details-<?= /* @noEscape */ $taxIter ?>">
+        <?php foreach ($rates as $rate) : ?>
+            <tr class="totals-tax-details">
                 <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int)$block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
-                    <?php if (!is_null($rate['percent'])): ?>
+                    <?php if ($rate['percent'] !== null) : ?>
                         (<?= (float)$rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
-                <?php if ($isFirst): ?>
+                <?php if ($isFirst) : ?>
                     <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
-                        <?= /* @noEscape */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
+                        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
index 88088ed5b503d..991fbf9c5c81f 100644
--- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
@@ -12,18 +14,18 @@ $_item = $block->getItem();
 $_order = $_item->getOrder();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
     <?= /* @noEscape */ $_order->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index f9444d025d56a..12aa494f74e7a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -8,7 +8,7 @@
 
 $_item = $block->getItem();
 ?>
-<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
@@ -16,7 +16,7 @@ $_item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
+<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index e672ad64ba874..e5fd756e2f373 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -8,7 +8,7 @@
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
@@ -17,7 +17,7 @@ $_item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
             <?= /* @noEscape */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index da3f7a9f9134c..d1346b499975c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -3,26 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
     $_order  = $block->getOrder();
     $_source = $block->getSource();
-    $_fullInfo = $this->helper('Magento\Tax\Helper\Data')->getCalculatedTaxes($_source);
-    global $taxIter; $taxIter++;
+    $_fullInfo = $this->helper(\Magento\Tax\Helper\Data::class)->getCalculatedTaxes($_source);
 ?>
 
-<?php if ($_fullInfo && $block->displayFullSummary()): ?>
-        <?php foreach ($_fullInfo as $info): ?>
+<?php if ($_fullInfo && $block->displayFullSummary()) : ?>
+        <?php foreach ($_fullInfo as $info) : ?>
             <?php
                 $percent    = $info['percent'];
                 $amount     = $info['tax_amount'];
                 $baseAmount = $info['base_tax_amount'];
                 $title      = $info['title'];
             ?>
-            <tr class="totals tax details details-<?= /* @noEscape */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
+            <tr class="totals tax details <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
                 <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
-                    <?php if (!is_null($percent)): ?>
+                    <?php if ($percent !== null) : ?>
                         (<?= (float)$percent ?>%)
                     <?php endif; ?>
                     <br />
@@ -34,17 +35,17 @@
         <?php endforeach; ?>
 <?php endif;?>
 
-<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()): ?>
+<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()) : ?>
 <tr class="totals-tax-summary">
-<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()): ?>
+<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()) : ?>
 <tr class="totals-tax-summary plane">
-<?php else: ?>
+<?php else : ?>
 <tr class="totals-tax">
 <?php endif; ?>
     <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
-        <?php if ($block->displayFullSummary()): ?>
+        <?php if ($block->displayFullSummary()) : ?>
             <div class="detailed"><?= $block->escapeHtml(__('Tax')) ?></div>
-        <?php else: ?>
+        <?php else : ?>
             <?= $block->escapeHtml(__('Tax')) ?>
         <?php endif;?>
     </th>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index 6e968a47306c8..0d8365ff4bd85 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -3,34 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getRowPriceExclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                    <?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>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
                 <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceExclTaxHtml() ?>
@@ -39,24 +41,24 @@ $_item = $block->getItem();
         <?php endif; ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getRowPriceInclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                    <?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>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
                 <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceInclTaxHtml() ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index 7802028860502..8dbaff2e2a6b1 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -3,35 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getUnitPriceExclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                    <?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>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
                 <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceExclTaxHtml() ?>
@@ -40,24 +42,24 @@ $_item = $block->getItem();
         <?php endif; ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
+        <?php if ($block->displayBothPrices()) : ?>
             <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getUnitPriceInclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                    <?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>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
                 <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceInclTaxHtml() ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index f3222ae68e79d..769e9e68e3a46 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
@@ -10,24 +12,24 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
             <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
@@ -36,22 +38,22 @@ $_item = $block->getItem();
     <?php endif; ?>
 <?php endif; ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
index c3c8547510ee7..fceca17acf61e 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -3,33 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
-
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
-    <?php if ($block->displayBothPrices()): ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
             <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
@@ -39,23 +40,23 @@ $_item = $block->getItem();
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
     <?= /* @noEscape */ $block->formatPrice(max(0, $_incl)) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
index 6b0cc43af95f5..362c88ecedd4b 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
@@ -10,23 +12,23 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
             <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
@@ -36,23 +38,23 @@ $_item = $block->getItem();
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?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 />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 097cbc8d36b9b..1b77231640868 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Renderer\Weee\Tax */
 $data = ['fptAttribute' => [
-    'region' => $this->helper('Magento\Framework\Json\Helper\Data')->jsonDecode(
-        $this->helper('Magento\Directory\Helper\Data')->getRegionJson()
+    'region' => $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode(
+        $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson()
     ),
     'itemsData' => $block->getValues(),
     'bundlePriceType' => '#price_type',
@@ -16,14 +18,14 @@ $data = ['fptAttribute' => [
 ?>
 <div id="attribute-<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>-container" class="field"
      data-attribute-code="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
-     data-mage-init="<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>">
+     data-mage-init="<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>">
     <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
     <div class="control">
         <table class="data-table">
             <thead>
                 <tr>
-                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
+                    <th class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
                     <th class="col-country required"><?= $block->escapeHtml(__('Country/State')) ?></th>
                     <th class="col-tax required"><?= $block->escapeHtml(__('Tax')) ?></th>
                     <th class="col-action"><?= $block->escapeHtml(__('Action')) ?></th>
@@ -50,12 +52,12 @@ $data = ['fptAttribute' => [
             $elementClass = $block->escapeHtmlAttr($block->getElement()->getClass());
         ?>
         <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
-            <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
+            <td class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none"<?php endif; ?>>
                 <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_website"
                         name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][website_id]"
                         class="<?= /* @noEscape */ $elementClass ?> website required-entry" data-role="select-website">
-                    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])): ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
+                    <?php foreach ($block->getWebsites() as $_websiteId => $_info) : ?>
+                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) : ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
@@ -63,7 +65,7 @@ $data = ['fptAttribute' => [
                 <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_country"
                         name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][country]"
                         class="<?= /* @noEscape */ $elementClass ?> country required-entry" data-role="select-country">
-                    <?php foreach ($block->getCountries() as $_country): ?>
+                    <?php foreach ($block->getCountries() as $_country) : ?>
                     <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index 01f003246e8f9..a2b5ad4f196e8 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -15,22 +15,22 @@ $taxDisplay = $block->getTaxDisplayConfig();
 $priceDisplay = $block->isPriceIncludesTax();
 ?>
 
-<?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final ?>
-    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
+<?php if ($block->showInclDescr() || $block->showExclDescrIncl()) : // incl. + weee ||  excl. + weee + final ?>
+    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute) : ?>
         <?php
             $attributeName = $block->escapeHtmlAttr($block->renderWeeeTaxAttributeName($weeeTaxAttribute));
         ?>
-        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
+        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX) : ?>
             <span class="weee"
                   data-price-type="weee"
                   data-label="<?= /* @noEscape */ $attributeName ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
-        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX) : ?>
             <span class="weee"
                   data-price-type="weee"
                   data-label="<?= /* @noEscape */ $attributeName ?>">
                             <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
-        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH) : ?>
             <span class="weee"
                   data-price-type="weee"
                   data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
@@ -43,7 +43,7 @@ $priceDisplay = $block->isPriceIncludesTax();
     <?php endforeach; ?>
 <?php endif; ?>
 
-<?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
+<?php if ($block->showExclDescrIncl()) : // excl. + weee + final ?>
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
           data-price-amount="<?= /* @noEscape */ $block->getRawFinalAmount() ?>"
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 8bb545d0f535e..0cd1ca8057984 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
@@ -13,27 +15,27 @@ $originalZone = $block->getZone();
 $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <span class="minicart-tax-total">
-    <?php else: ?>
+    <?php else : ?>
         <span class="minicart-price">
     <?php endif; ?>
         <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
         </span>
 
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="minicart-tax-info">
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                     <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="minicart-tax-total">
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
@@ -45,27 +47,27 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <span class="minicart-tax-total">
-    <?php else: ?>
+    <?php else : ?>
         <span class="minicart-price">
     <?php endif; ?>
         <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
         </span>
 
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="minicart-tax-info">
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                     <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="minicart-tax-total">
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index ad98039519cea..e1f4207f3740c 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -4,28 +4,30 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
     <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-<?php else: ?>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
     <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
+    <?php if ($block->displayFinalPrice()) : ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index e0513f522a770..1189c1b9ba2fb 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -4,31 +4,33 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
     <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-<?php else: ?>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
     <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
+    <?php if ($block->displayFinalPrice()) : ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index cf2693842b8d3..809d8ac90e12e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -4,29 +4,30 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
     <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-<?php else: ?>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
-
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
     <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$_item->getId() ?>" style="display:none;">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
+    <?php if ($block->displayFinalPrice()) : ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index b4389dea160c3..81ec8c1c6795b 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -4,32 +4,34 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
     <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
-<?php else: ?>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
     <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
+    <?php if ($block->displayFinalPrice()) : ?>
         <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index 0b3b4b7ca5c1d..edcf73d2f9577 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -3,35 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 /** @var \Magento\Sales\Model\Order $_order */
 $_order = $_item->getOrder();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <span class="label"><?=  $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                     <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
             <span class="nobr"><?=  $block->escapeHtml(__('Total')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
         <?php endif; ?>
@@ -39,22 +41,22 @@ $_order = $_item->getOrder();
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
         <br /><span class="label"><?=  $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                     <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <span class="nobr"><?=  $block->escapeHtml(__('Total Incl. Tax')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index c78cb30dd9d56..afecc8be030a4 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -4,31 +4,33 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
 ?>
-<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()) : ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
-        <?php else: ?>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
             <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
                     data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
@@ -40,28 +42,28 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
-        <?php else: ?>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
                 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
                       data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 5b50c82255b3a..8c52144aeb7eb 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -4,31 +4,33 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
 ?>
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
-        <?php else: ?>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
             <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
                     data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
@@ -40,28 +42,28 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
-        <?php else: ?>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
                 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$item->getId() ?>"
                 style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
                       data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">

From c62c3c8778f20f355c0ebcf2b2266979f088f6f7 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Wed, 15 May 2019 17:11:53 -0500
Subject: [PATCH 05/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../Tax/view/frontend/templates/checkout/grandtotal.phtml | 8 ++++----
 .../Tax/view/frontend/templates/checkout/subtotal.phtml   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 94814c5156610..ee8ae505aa9e5 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -10,11 +10,11 @@
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int)$block->getColspan();
+?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
-    <?php
-        $style = $block->escapeHtmlAttr($block->getStyle());
-        $colspan = (int)$block->getColspan();
-    ?>
     <tr class="grand totals excl">
         <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 1dd3570f1c6f2..914e5bda9abc6 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -11,11 +11,11 @@
  * @see \Magento\Tax\Block\Checkout\Subtotal
  */
 ?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int)$block->getColspan();
+?>
 <?php if ($block->displayBoth()) : ?>
-    <?php
-        $style = $block->escapeHtmlAttr($block->getStyle());
-        $colspan = (int)$block->getColspan();
-    ?>
 <tr class="totals sub excl">
     <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>

From f2446ba5382fb44b5ca35a1dd75e4470189c9dd2 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Thu, 16 May 2019 16:51:18 -0500
Subject: [PATCH 06/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../Magento/Tax/view/base/templates/pricing/adjustment.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index 3eba15da887a4..e87d1c9eb96aa 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -8,7 +8,7 @@
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 
 <?php if ($block->displayBothPrices()) : ?>
-    <span id="<?= /* @noEscape */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
+    <span id="<?= $block->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
           data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
           data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
           data-price-type="basePrice"

From 009142c4c17cd8f8ea8526bdedcf50339c5bb0c5 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Mon, 20 May 2019 14:49:06 -0500
Subject: [PATCH 07/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../view/adminhtml/templates/items/price/row.phtml   |  2 +-
 .../Tax/view/adminhtml/templates/rate/title.phtml    |  4 ++--
 .../Tax/view/adminhtml/templates/rule/edit.phtml     |  2 +-
 .../view/adminhtml/templates/toolbar/rate/save.phtml |  2 +-
 .../base/templates/pricing/adjustment/bundle.phtml   |  2 +-
 .../frontend/templates/checkout/grandtotal.phtml     |  4 ++--
 .../view/frontend/templates/checkout/shipping.phtml  |  6 +++---
 .../view/frontend/templates/checkout/subtotal.phtml  |  4 ++--
 .../Tax/view/frontend/templates/checkout/tax.phtml   | 12 ++++++------
 .../Tax/view/frontend/templates/order/tax.phtml      |  6 +++---
 .../onepage/review/item/price/row_excl_tax.phtml     |  6 +++---
 .../onepage/review/item/price/row_incl_tax.phtml     |  6 +++---
 .../onepage/review/item/price/unit_excl_tax.phtml    |  6 +++---
 .../onepage/review/item/price/unit_incl_tax.phtml    |  6 +++---
 .../view/frontend/templates/item/price/row.phtml     | 12 ++++++------
 .../view/frontend/templates/item/price/unit.phtml    | 12 ++++++------
 16 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index e6de067a4de64..4d680dc072e52 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -22,7 +22,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"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
         <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBaseSubtotalInclTax($_item); ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 3d6d3d19dc314..7dd6f6cee8c63 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -15,8 +15,8 @@
                 <input
                     class="admin__control-text<?php if ($_store->getId() == 0) : ?> required-entry<?php endif; ?>"
                     type="text"
-                    name="title[<?= (int)$_store->getId() ?>]"
-                    value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>" />
+                    name="title[<?= (int) $_store->getId() ?>]"
+                    value="<?= $block->escapeHtmlAttr($_labels[(int) $_store->getId()]) ?>" />
             </div>
         </div>
     <?php endforeach; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 1ad16feef9690..81bdd874ead6c 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -113,7 +113,7 @@ require([
                 toggleAddButton:false,
                 addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
                 parse: null,
-                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl())?>',
+                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl()) ?>',
                 selectedValues: this.settings.selected_values,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 5e3ef15da5482..58c79bbfe9715 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -12,7 +12,7 @@
         "mage/mage"
     ], function($){
 
-        $('#<?= $block->escapeHtml($form->getForm()->getId()) ?>').mage('form').mage('validation');
+        $('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
         $(document).ready(function () {
             'use strict';
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index 9e60dc983e3ac..41430c0fbcfa8 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -13,6 +13,6 @@
 <?php elseif ($block->displayBothPrices()) : ?>
     <?= /* @noEscape */ $block->getDisplayAmount() ?>
     <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()) : ?>
-        (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax'))?>)
+        (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax')) ?>)
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index ee8ae505aa9e5..df177b6180511 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -12,7 +12,7 @@
 ?>
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
-$colspan = (int)$block->getColspan();
+$colspan = (int) $block->getColspan();
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
     <tr class="grand totals excl">
@@ -41,4 +41,4 @@ $colspan = (int)$block->getColspan();
             <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
-<?php endif;?>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index ffbb33487136d..3f5a55e5fa325 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -14,7 +14,7 @@
 <?php if ($block->displayShipping()) : ?>
     <?php
         $style = $block->escapeHtmlAttr($block->getStyle());
-        $colspan = (int)$block->getColspan();
+        $colspan = (int) $block->getColspan();
     ?>
     <?php if ($block->displayBoth()) : ?>
     <tr class="totals shipping excl">
@@ -42,7 +42,7 @@
             <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
-    <?php else :?>
+    <?php else : ?>
     <tr class="totals shipping excl">
         <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
@@ -51,5 +51,5 @@
             <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
-    <?php endif;?>
+    <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 914e5bda9abc6..010a7b8dcfe4a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -13,7 +13,7 @@
 ?>
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
-$colspan = (int)$block->getColspan();
+$colspan = (int) $block->getColspan();
 ?>
 <?php if ($block->displayBoth()) : ?>
 <tr class="totals sub excl">
@@ -41,4 +41,4 @@ $colspan = (int)$block->getColspan();
         <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
-<?php endif;?>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 01dbeb68a0344..0329db406fa16 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -23,12 +23,12 @@ if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_va
 ?>
 
 <tr <?= /* @noEscape */ $attributes ?>>
-    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int)$block->getColspan() ?>" scope="row">
+    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
         <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
         <?php else : ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-        <?php endif;?>
+        <?php endif; ?>
     </th>
     <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
         <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_value) ?>
@@ -45,15 +45,15 @@ if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_va
 
         <?php foreach ($rates as $rate) : ?>
             <tr class="totals-tax-details">
-                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int)$block->getColspan() ?>" scope="row">
+                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int) $block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
                     <?php if ($rate['percent'] !== null) : ?>
-                        (<?= (float)$rate['percent'] ?>%)
+                        (<?= (float) $rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
                 <?php if ($isFirst) : ?>
                     <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
                         <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
@@ -61,4 +61,4 @@ if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_va
             <?php $isFirst = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
-<?php endif;?>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index d1346b499975c..5e6f4e5277a30 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -24,7 +24,7 @@
                 <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if ($percent !== null) : ?>
-                        (<?= (float)$percent ?>%)
+                        (<?= (float) $percent ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
@@ -33,7 +33,7 @@
                 </td>
             </tr>
         <?php endforeach; ?>
-<?php endif;?>
+<?php endif; ?>
 
 <?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()) : ?>
 <tr class="totals-tax-summary">
@@ -47,7 +47,7 @@
             <div class="detailed"><?= $block->escapeHtml(__('Tax')) ?></div>
         <?php else : ?>
             <?= $block->escapeHtml(__('Tax')) ?>
-        <?php endif;?>
+        <?php endif; ?>
     </th>
     <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr(__('Tax')) ?>">
         <?= /* @noEscape */ $_order->formatPrice($_source->getTaxAmount()) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index e1f4207f3740c..15abae5c889fe 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -11,7 +11,7 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
 <?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -19,7 +19,7 @@ $_item = $block->getItem();
     </span>
 
 <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
     <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
@@ -28,7 +28,7 @@ $_item = $block->getItem();
     </span>
 
     <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index 1189c1b9ba2fb..b848698b8b829 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -14,7 +14,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
 <?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -22,7 +22,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
     </span>
 
 <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
@@ -31,7 +31,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
     </span>
 
     <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index 809d8ac90e12e..a485de90c871d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -11,7 +11,7 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
 <?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -19,7 +19,7 @@ $_item = $block->getItem();
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
 <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$_item->getId() ?>" style="display:none;">
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>" style="display:none;">
     <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
@@ -28,7 +28,7 @@ $_item = $block->getItem();
     </span>
 
     <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 81ec8c1c6795b..0dada610e181e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -14,7 +14,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
 <?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
@@ -23,7 +23,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
     </span>
 
 <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$_item->getId() ?>" style="display: none;">
+    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
@@ -32,7 +32,7 @@ $_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
     </span>
 
     <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$_item->getId() ?>"}}'>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index afecc8be030a4..37aa852871408 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -14,7 +14,7 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
         <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -22,7 +22,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
@@ -32,7 +32,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
@@ -46,7 +46,7 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
         <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -54,7 +54,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int)$item->getId() ?>"
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -65,7 +65,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 8c52144aeb7eb..4e62409ad00f4 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -14,7 +14,7 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
         <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -22,7 +22,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= (int)$item->getId() ?>" style="display: none;">
+            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
@@ -32,7 +32,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
@@ -46,7 +46,7 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
         <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
@@ -54,7 +54,7 @@ $item = $block->getItem();
             </span>
 
         <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int)$item->getId() ?>"
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -65,7 +65,7 @@ $item = $block->getItem();
 
             <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int)$item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>

From 578610e1d0c9afa2657a9e718f9851ed00bef3ef Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Tue, 21 May 2019 14:24:15 -0500
Subject: [PATCH 08/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

---
 .../templates/toolbar/class/add.phtml         | 13 ++++++++++
 .../templates/toolbar/class/save.phtml        | 23 ++++++++++++++++++
 .../templates/toolbar/rule/add.phtml          | 13 ++++++++++
 .../templates/toolbar/rule/save.phtml         | 24 +++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
 create mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
 create mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
 create mode 100644 app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
new file mode 100644
index 0000000000000..a674424f723ca
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @deprecated
+// @codingStandardsIgnoreFile
+?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+        <?= $block->escapeHtml(__('Add New Class')) ?>
+    </button>
+</div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
new file mode 100644
index 0000000000000..cfe5a7d14785a
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @deprecated
+// @codingStandardsIgnoreFile
+?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
+    <?= $block->getSaveButtonHtml() ?>
+</div>
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require(['jquery', "mage/mage"], function(jQuery){
+
+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
+
+    });
+    </script>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
new file mode 100644
index 0000000000000..b0ad610272f80
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @deprecated
+// @codingStandardsIgnoreFile
+?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+        <?= $block->escapeHtml(__('Add New Tax Rule')) ?>
+    </button>
+</div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
new file mode 100644
index 0000000000000..7c5de950469ab
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @deprecated
+// @codingStandardsIgnoreFile
+?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
+    <?= $block->getSaveButtonHtml() ?>
+    <?= $block->getDeleteButtonHtml() ?>
+</div>
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require(['jquery', "mage/mage"], function(jQuery){
+
+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
+
+    });
+    </script>
+<?php endif; ?>

From f0e8b7a32c9e37df3b0790acfc56c78e27e8cd7d Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Mon, 3 Jun 2019 11:50:29 -0500
Subject: [PATCH 09/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

- Deleting file again (originally in the 8e79510 commit) after merge conflict resolved incorrectly.
---
 .../Magento/Test/Php/_files/whitelist/exempt_modules/ce.php       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
deleted file mode 100644
index e69de29bb2d1d..0000000000000

From 1d14cb8abf640a158f1b919a99ddb3cc9a1b7124 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@magento.com>
Date: Tue, 4 Jun 2019 10:14:15 -0500
Subject: [PATCH 10/10] MAGETWO-99488: Eliminate @escapeNotVerified in
 Tax-related Modules

- Reverting removal of css class suffix
---
 app/code/Magento/Tax/view/frontend/templates/order/tax.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index 5e6f4e5277a30..6115ed5ee9311 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -5,11 +5,14 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Squiz.PHP.GlobalKeyword.NotAllowed
 ?>
 <?php
     $_order  = $block->getOrder();
     $_source = $block->getSource();
     $_fullInfo = $this->helper(\Magento\Tax\Helper\Data::class)->getCalculatedTaxes($_source);
+    global $taxIter;
+    $taxIter++;
 ?>
 
 <?php if ($_fullInfo && $block->displayFullSummary()) : ?>
@@ -20,7 +23,7 @@
                 $baseAmount = $info['base_tax_amount'];
                 $title      = $info['title'];
             ?>
-            <tr class="totals tax details <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
+            <tr class="totals tax details details-<?= (int) $taxIter ?><?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
                 <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if ($percent !== null) : ?>