From 2e1475c3d172f7047fb4c014d09cffb7617d3c21 Mon Sep 17 00:00:00 2001
From: Vlad <vkrokh@gmail.com>
Date: Mon, 10 Feb 2025 12:35:42 +0300
Subject: [PATCH 1/2] Update subtotal.phtml

---
 .../Magento/Tax/view/frontend/templates/checkout/subtotal.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dc9034fc9f694..f8b5c6e88fcdf 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -21,7 +21,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <tdclass="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
+    <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>

From d927d0bcdd6b2a3e8960acd7d000fcb09100401a Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Mon, 14 Apr 2025 10:49:49 +0530
Subject: [PATCH 2/2] Fixed Static Test Failures

---
 .../templates/checkout/subtotal.phtml         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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 f8b5c6e88fcdf..41db5db0285df 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -1,17 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * @var $block \Magento\Tax\Block\Checkout\Subtotal
  * @see \Magento\Tax\Block\Checkout\Subtotal
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var $escaper \Magento\Framework\Escaper
  */
 ?>
 <?php
-$style = $block->escapeHtmlAttr($block->getStyle());
+$style = $escaper->escapeHtmlAttr($block->getStyle());
 $colspan = (int) $block->getColspan();
 /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
 $checkoutHelper = $block->getData('checkoutHelper');
@@ -19,9 +20,9 @@ $checkoutHelper = $block->getData('checkoutHelper');
 <?php if ($block->displayBoth()): ?>
 <tr class="totals sub excl">
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
+        <?= $escaper->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
+    <td class="amount" data-th="<?= $escaper->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
@@ -31,9 +32,9 @@ $checkoutHelper = $block->getData('checkoutHelper');
     <?php endif; ?>
 <tr class="totals sub incl">
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
+        <?= $escaper->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
-    <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
+    <td class="amount" data-th="<?= $escaper->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
@@ -44,9 +45,9 @@ $checkoutHelper = $block->getData('checkoutHelper');
 <?php else: ?>
 <tr class="totals sub">
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
-        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
+        <?= $escaper->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
-    <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+    <td class="amount" data-th="<?= $escaper->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>