diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
index c888aaa6ebabc..de991650f6f75 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Adminhtml\Transparent\Form $block
- * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
- */
-$code = $block->escapeHtml($block->getMethodCode());
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Adminhtml\Transparent\Form;
+
+/** @var Escaper $escaper */
+/** @var Form $block */
+/** @var SecureHtmlRenderer $secureRenderer */
+$code = $escaper->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
@@ -16,16 +20,16 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
 <fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="field-type admin__field _required">
         <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type">
-            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="admin__field-control">
             <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="required-entry validate-cc-type-select admin__control-select">
                 <option value=""></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?= $block->escapeHtml($typeCode) ?>"
+                    <option value="<?= $escaper->escapeHtml($typeCode) ?>"
                             <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($typeName) ?>
+                        <?= $escaper->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -33,11 +37,11 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
     <div class="field-number admin__field _required">
         <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_number">
-            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="admin__field-control">
             <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
-                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
+                   title="<?= $escaper->escapeHtml(__('Credit Card Number')) ?>"
                    class="admin__control-text validate-cc-number"
                    value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
@@ -59,24 +63,24 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
     <div class="field-date admin__field _required">
         <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_expiration">
-            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Expiration Date')) ?></span>
         </label>
         <div class="admin__field-control">
             <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
                     class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                    <option value="<?= $block->escapeHtml($k) ?>"
+                    <option value="<?= $escaper->escapeHtml($k) ?>"
                             <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($v) ?>
+                        <?= $escaper->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year required-entry">
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
-                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                    <option value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                             <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($v) ?>
+                        <?= $escaper->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -86,10 +90,10 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     <?php if ($block->hasVerification()): ?>
         <div class="field-number required admin__field _required">
             <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_cid">
-                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="admin__field-control">
-                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                <input type="text" title="<?= $escaper->escapeHtml(__('Card Verification Number')) ?>"
                        class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
                        id="<?= /* @noEscape */ $code ?>_cc_cid"
                        name="payment[cc_cid]" value="<?= /* @noEscape */ $block->getInfoData('cc_cid') ?>"/>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
index 3cd88bddbfb1f..c3a6ea75568c1 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -3,23 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Info $block
- * @see \Magento\Payment\Block\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 $specificInfo = $block->getSpecificInformation();
 $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($paymentTitle) ?>
+<?= $escaper->escapeHtml($paymentTitle) ?>
 
 <?php if ($specificInfo) : ?>
     <table class="data-table admin__table-secondary">
     <?php foreach ($specificInfo as $label => $value) : ?>
         <tr>
-            <th><?= $block->escapeHtml($label) ?>:</th>
+            <th><?= $escaper->escapeHtml($label) ?>:</th>
             <td>
-                <?= /* @noEscape */ nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
+                <?= /* @noEscape */ nl2br($escaper->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
             </td>
         </tr>
     <?php endforeach; ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
index f60c1d063addf..e96ad60cd9556 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
@@ -3,18 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Info $block
- * @see \Magento\Payment\Block\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 ?>
-<p><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></p>
+<p><?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?></p>
 <?php if ($block->getInstructions()) : ?>
     <table>
         <tbody>
             <tr>
-                <td><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></td>
+                <td><?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getInstructions())) ?></td>
             </tr>
         </tbody>
     </table>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
index 54b9e48d07a94..427033ead7af8 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
@@ -3,21 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @see \Magento\Payment\Block\Info
- * @var \Magento\Payment\Block\Info $block
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($paymentTitle) ?>{{pdf_row_separator}}
+<?= $escaper->escapeHtml($paymentTitle) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()) : ?>
     <?php foreach ($specificInfo as $label => $value) : ?>
-        <?= $block->escapeHtml($label) ?>:
-        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+        <?= $escaper->escapeHtml($label) ?>:
+        <?= $escaper->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
         {{pdf_row_separator}}
     <?php endforeach; ?>
 <?php endif;?>
 
-<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
+<?= $escaper->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
index d187b64683e45..a8b5760db9ae3 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
@@ -3,14 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Info $block
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 ?>
 <div>
     <?= $block->getMethod()->getTitle()
-        ? $block->escapeHtml($block->getMethod()->getTitle())
-        : $block->escapeHtml(__('Payment method')); ?>
-    <?= $block->escapeHtml(__(' is not available. You still can process offline actions.')) ?>
+        ? $escaper->escapeHtml($block->getMethod()->getTitle())
+        : $escaper->escapeHtml(__('Payment method')); ?>
+    <?= $escaper->escapeHtml(__(' is not available. You still can process offline actions.')) ?>
 </div>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
index aacf0788fb43c..12ebac9ec0a4d 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Payment\Block\Transparent\Form $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Form;
 
-$code = $block->escapeHtml($block->getMethodCode());
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var Form $block */
+$code = $escaper->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
@@ -19,7 +24,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
-        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+        src="<?= $escaper->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display: none; width: 100%; background-color: transparent;",
     'iframe#' . /* @noEscape */ $code . '-transparent-iframe'
@@ -29,20 +34,20 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     class="admin__fieldset"
     data-mage-init='{
      "transparent":{
-        "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
-        "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
+        "cardFieldsMap":<?= $escaper->escapeHtml($block->getCardFieldsMap()) ?>,
+        "controller":"<?= $escaper->escapeHtml($block->getRequest()->getControllerName()) ?>",
         "gateway":"<?= /* @noEscape */ $code ?>",
-        "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
-        "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
-        "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
-        "expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
-        "nativeAction":"<?= $block->escapeUrl(
+        "dateDelim":"<?= $escaper->escapeHtml($block->getDateDelim()) ?>",
+        "orderSaveUrl":"<?= $escaper->escapeUrl($block->getOrderUrl()) ?>",
+        "cgiUrl":"<?= $escaper->escapeUrl($block->getCgiUrl()) ?>",
+        "expireYearLength":"<?= $escaper->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
+        "nativeAction":"<?= $escaper->escapeUrl(
             $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])
         ) ?>"
       }, "validation":[]}'>
     <div class="admin__field _required">
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
-            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="admin__field-control">
             <select id="<?= /* @noEscape */ $code ?>_cc_type"
@@ -50,12 +55,12 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     data-container="<?= /* @noEscape */ $code ?>-cc-type"
                     data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
                     name="payment[cc_type]">
-                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
+                <option value=""><?= $escaper->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option
-                        value="<?= $block->escapeHtml($typeCode) ?>"
+                        value="<?= $escaper->escapeHtml($typeCode) ?>"
                         <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($typeName) ?>
+                        <?= $escaper->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -63,14 +68,14 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     </div>
     <div class="admin__field _required field-number">
         <label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
-            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="admin__field-control">
             <input type="text"
                    id="<?= /* @noEscape */ $code ?>_cc_number"
                    data-container="<?= /* @noEscape */ $code ?>-cc-number"
                    name="payment[cc_number]"
-                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
+                   title="<?= $escaper->escapeHtml(__('Credit Card Number')) ?>"
                    class="admin__control-text"
                    value=""
                    data-validate='{
@@ -98,7 +103,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     </div>
     <div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
         <label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
-            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Expiration Date')) ?></span>
         </label>
 
         <div class="admin__field-control">
@@ -109,9 +114,9 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     name="payment[cc_exp_month]">
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
-                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                        value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                        <?= $block->escapeHtml($v) ?>
+                        <?= $escaper->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -122,9 +127,9 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     name="payment[cc_exp_year]">
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
-                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                        value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($v) ?>
+                        <?= $escaper->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -133,10 +138,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     <?php if ($block->hasVerification()): ?>
         <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
-                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="admin__field-control">
-                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                <input type="text" title="<?= $escaper->escapeHtml(__('Card Verification Number')) ?>"
                        data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        class="admin__control-text cvv"
                        id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
index 77d881257f10a..79e04d8d739ab 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Transparent\Iframe $block
- * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
- */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Iframe;
+
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var Iframe $block */
 $params = $block->getParams();
 
 /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
@@ -18,12 +22,12 @@ $jsonHelper = $block->getData('jsonHelper');
     <?php $scriptString = '' ?>
 <?php if (isset($params['redirect'])): ?>
     <?php $scriptString .= <<<script
-    window.location="{$block->escapeJs($params['redirect'])}";
+    window.location="{$escaper->escapeJs($params['redirect'])}";
 script;
     ?>
 <?php elseif (isset($params['redirect_parent'])): ?>
     <?php $scriptString .= <<<script
-    window.top.location="{$block->escapeJs($params['redirect_parent'])}";
+    window.top.location="{$escaper->escapeJs($params['redirect_parent'])}";
 script;
     ?>
 <?php elseif (isset($params['error_msg'])): ?>
@@ -34,7 +38,7 @@ script;
     ?>
 <?php elseif (isset($params['order_success'])): ?>
     <?php $scriptString .= <<<script
-    window.top.location = "{$block->escapeJs($params['order_success'])}";
+    window.top.location = "{$escaper->escapeJs($params['order_success'])}";
 script;
     ?>
 <?php else: ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
index 5997648ed5582..ce8f867b653e5 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
@@ -3,17 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Transparent\Info $block
- * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
- * @see \Magento\Payment\Block\Transparent\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
+/** @var SecureHtmlRenderer $secureRenderer */
 ?>
-<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
-    <div><?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?></div>
+<fieldset id="payment_form_<?= $escaper->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
+    <div><?= $escaper->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?></div>
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+    'fieldset#payment_form_' . $escaper->escapeHtml($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/redirect.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/redirect.phtml
index 17fbdf780a40a..f16d30fe99dc8 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/redirect.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/redirect.phtml
@@ -3,18 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Payment\Block\Transparent\Redirect $block */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Transparent\Redirect;
+
+/** @var Escaper $escaper */
+/** @var Redirect $block */
 $params = $block->getPostParams();
 $redirectUrl = $block->getRedirectUrl();
 ?>
 <html>
 <head></head>
 <body onload="document.forms['proxy_form'].submit()">
-<form id="proxy_form" action="<?= $block->escapeUrl($redirectUrl) ?>"
+<form id="proxy_form" action="<?= $escaper->escapeUrl($redirectUrl) ?>"
       method="POST" hidden enctype="application/x-www-form-urlencoded" class="no-display">
     <?php foreach ($params as $name => $value):?>
-        <input value="<?= $block->escapeHtmlAttr($value) ?>" name="<?= $block->escapeHtmlAttr($name) ?>" type="hidden"/>
+        <input value="<?= $escaper->escapeHtmlAttr($value) ?>" name="<?= $escaper->escapeHtmlAttr($name) ?>" type="hidden"/>
     <?php endforeach?>
 </form>
 </body>
diff --git a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
index a8583ea5549fe..3ee5a80526ae6 100644
--- a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
@@ -3,20 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @see \Magento\Payment\Block\Info
- * @var \Magento\Payment\Block\Info $block
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+<?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()) : ?>
     <?php foreach ($specificInfo as $label => $value) : ?>
-        <?= $block->escapeHtml($label) ?>:
-        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+        <?= $escaper->escapeHtml($label) ?>:
+        <?= $escaper->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
         {{pdf_row_separator}}
     <?php endforeach; ?>
 <?php endif;?>
 
-<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
+<?= $escaper->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
index 86c3099db7550..b17aaceac15af 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Transparent\Form $block
- * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
- */
-$code = $block->escapeHtml($block->getMethodCode());
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Form;
+
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var Form $block */
+$code = $escaper->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
@@ -17,7 +21,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
           id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="field type required">
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="label">
-            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="control">
             <select id="<?= /* @noEscape */ $code ?>_cc_type"
@@ -29,11 +33,11 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                         "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
                     }'
                     class="select">
-                <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
+                <option value=""><?= $escaper->escapeHtml(__('--Please Select--')) ?></option>
             <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                <option value="<?= $block->escapeHtml($typeCode) ?>"
+                <option value="<?= $escaper->escapeHtml($typeCode) ?>"
                     <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-                    <?= $block->escapeHtml($typeName) ?>
+                    <?= $escaper->escapeHtml($typeName) ?>
                 </option>
             <?php endforeach; ?>
             </select>
@@ -41,11 +45,11 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
     <div class="field number required">
         <label for="<?= /* @noEscape */ $code ?>_cc_number" class="label">
-            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="control">
             <input type="number" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
-                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="input-text" value=""
+                   title="<?= $escaper->escapeHtml(__('Credit Card Number')) ?>" class="input-text" value=""
                    data-validate='{
                        "required-number":true,
                        "validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
@@ -70,7 +74,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
     <div class="field date required" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
         <label for="<?= /* @noEscape */ $code ?>_expiration" class="label">
-            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Expiration Date')) ?></span>
         </label>
         <div class="control">
             <div class="fields group group-2">
@@ -82,9 +86,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                                 data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code
                                 ?>_expiration_yr"}'>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                                <option value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                                    <?= $block->escapeHtml($v) ?>
+                                    <?= $escaper->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -95,9 +99,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                         <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                                 class="select year" data-validate='{required:true}'>
                             <?php foreach ($block->getCcYears() as $k => $v): ?>
-                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>
+                                <option value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>
                                 "<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-                                    <?= $block->escapeHtml($v) ?>
+                                    <?= $escaper->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -109,10 +113,10 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     <?php if ($block->hasVerification()): ?>
     <div class="field cvv required" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
         <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
-            <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Card Verification Number')) ?></span>
         </label>
         <div class="control">
-            <input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+            <input type="number" title="<?= $escaper->escapeHtml(__('Card Verification Number')) ?>"
                    class="input-text cvv" id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
                    data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'/>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
@@ -131,12 +135,12 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                 '#' . $code . '_cc_cid'
             ) ?>
             <?php $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' .
-                $block->escapeHtml(__('Card Verification Number Visual Reference')) .
-                '\" title=\"' . $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />'; ?>
+                $escaper->escapeHtml(__('Card Verification Number Visual Reference')) .
+                '\" title=\"' . $escaper->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />'; ?>
             <div class="note">
-                <a href="#" class="action cvv" title="<?= $block->escapeHtml(__('What is this?')) ?>"
+                <a href="#" class="action cvv" title="<?= $escaper->escapeHtml(__('What is this?')) ?>"
                    data-mage-init='{"tooltip": {"content": "<?= /* @noEscape */ $content ?>"}}'>
-                    <span><?= $block->escapeHtml(__('What is this?')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('What is this?')) ?></span>
                 </a>
             </div>
         </div>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
index 8649c0416f124..97f353ebaa25c 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Info $block
- * @see \Magento\Payment\Block\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 $specificInfo = $block->getSpecificInformation();
-$title = $block->escapeHtml($block->getMethod()->getTitle());
+$title = $escaper->escapeHtml($block->getMethod()->getTitle());
 ?>
 <dl class="payment-method">
     <dt class="title"><?= /* @noEscape */ $title ?></dt>
@@ -19,9 +21,9 @@ $title = $block->escapeHtml($block->getMethod()->getTitle());
             <caption class="table-caption"><?= /* @noEscape */ $title ?></caption>
             <?php foreach ($specificInfo as $label => $value) : ?>
                 <tr>
-                    <th scope="row"><?= $block->escapeHtml($label) ?></th>
+                    <th scope="row"><?= $escaper->escapeHtml($label) ?></th>
                     <td>
-                        <?= /* @noEscape */ nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
+                        <?= /* @noEscape */ nl2br($escaper->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
index 60efae16b1711..3668957cff57f 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
@@ -3,15 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Info $block
- * @see \Magento\Payment\Block\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 ?>
 <dl class="payment-method">
-    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?></dt>
 <?php if ($block->getInstructions()) : ?>
-    <dd class="content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></dd>
+    <dd class="content"><?= /* @noEscape */ nl2br($escaper->escapeHtml($block->getInstructions())) ?></dd>
 <?php endif; ?>
 </dl>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
index a8583ea5549fe..3ee5a80526ae6 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
@@ -3,20 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @see \Magento\Payment\Block\Info
- * @var \Magento\Payment\Block\Info $block
- */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+<?= $escaper->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()) : ?>
     <?php foreach ($specificInfo as $label => $value) : ?>
-        <?= $block->escapeHtml($label) ?>:
-        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+        <?= $escaper->escapeHtml($label) ?>:
+        <?= $escaper->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
         {{pdf_row_separator}}
     <?php endforeach; ?>
 <?php endif;?>
 
-<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
+<?= $escaper->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
index 06ae865be99f2..003d19db4e20a 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
@@ -3,47 +3,52 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Payment\Block\Transparent\Form $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Form;
 
-$code = $block->escapeHtml($block->getMethodCode());
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var Form $block */
+$code = $escaper->escapeHtml($block->getMethodCode());
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 $ccType = $block->getInfoData('cc_type');
-$content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Checkout::cvv.png')) . '\" alt=\"' .
-    $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" title=\"' .
-    $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />';
+$content = '<img src=\"' . $escaper->escapeUrl($block->getViewFileUrl('Magento_Checkout::cvv.png')) . '\" alt=\"' .
+    $escaper->escapeHtml(__('Card Verification Number Visual Reference')) . '\" title=\"' .
+    $escaper->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />';
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
 <iframe width="0" height="0" id="<?= /* @noEscape */ $code ?>-transparent-iframe"
         data-container="<?= /* @noEscape */ $code ?>-transparent-iframe" allowtransparency="true"
         frameborder="0"  name="iframeTransparent"
-        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+        src="<?= $escaper->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display: none; width: 100%; background-color: transparent;",
     'iframe#' . /* @noEscape */ $code . '-transparent-iframe'
 ) ?>
 <form class="form" id="co-transparent-form" action="#" method="post" data-mage-init='{
     "transparent":{
-        "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
+        "controller":"<?= $escaper->escapeHtml($block->getRequest()->getControllerName()) ?>",
         "gateway":"<?= /* @noEscape */ $code ?>",
-        "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
-        "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
-        "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
-        "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
-        "nativeAction":"<?= $block->escapeUrl(
+        "orderSaveUrl":"<?= $escaper->escapeUrl($block->getOrderUrl()) ?>",
+        "cgiUrl":"<?= $escaper->escapeUrl($block->getCgiUrl()) ?>",
+        "dateDelim":"<?= $escaper->escapeHtml($block->getDateDelim()) ?>",
+        "cardFieldsMap":<?= $escaper->escapeHtml($block->getCardFieldsMap()) ?>,
+        "nativeAction":"<?= $escaper->escapeUrl(
             $block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])
         ) ?>"
     }, "validation":[]}'>
     <fieldset class="fieldset ccard <?= /* @noEscape */ $code ?>" id="payment_form_<?= /* @noEscape */ $code ?>">
         <legend class="legend">
-            <span><?= $block->escapeHtml(__('Credit Card Information')) ?></span>\
+            <span><?= $escaper->escapeHtml(__('Credit Card Information')) ?></span>\
         </legend><br />
         <div class="field required type">
             <label for="<?= /* @noEscape */ $code ?>_cc_type" class="label">
-                <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Credit Card Type')) ?></span>
             </label>
             <div class="control">
                 <select id="<?= /* @noEscape */ $code ?>_cc_type" data-container="<?= /* @noEscape */ $code ?>-cc-type"
@@ -52,24 +57,24 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                             required:true,
                             "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
                         }'>
-                    <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
+                    <option value=""><?= $escaper->escapeHtml(__('--Please Select--')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?= $block->escapeHtml($typeCode) ?>"
+                    <option value="<?= $escaper->escapeHtml($typeCode) ?>"
                         <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-                        <?= $block->escapeHtml($typeName) ?></option>
+                        <?= $escaper->escapeHtml($typeName) ?></option>
                 <?php endforeach ?>
                 </select>
             </div>
         </div>
         <div class="field required number">
             <label for="<?= /* @noEscape */ $code ?>_cc_number" class="label">
-                <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Credit Card Number')) ?></span>
             </label>
             <div class="control">
                 <input id="<?= /* @noEscape */ $code ?>_cc_number"
                        type="number"
                        data-container="<?= /* @noEscape */ $code ?>-cc-number" name="payment[cc_number]"
-                       title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
+                       title="<?= $escaper->escapeHtml(__('Credit Card Number')) ?>"
                        class="input-text"
                        value=""
                        data-validate='{
@@ -97,7 +102,7 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
         </div>
         <div class="field required date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
             <label for="<?= /* @noEscape */ $code ?>_expiration" class="label">
-                <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Expiration Date')) ?></span>
             </label>
             <div class="control">
                 <div class="fields group group-2">
@@ -112,9 +117,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                                         "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
                                     }'>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                                <option value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                                    <?= $block->escapeHtml($v) ?>
+                                    <?= $escaper->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
                             </select>
@@ -128,9 +133,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                                     data-container="<?= /* @noEscape */ $code ?>-cc-year"
                                     data-validate='{required:true}'>
                             <?php foreach ($block->getCcYears() as $k => $v): ?>
-                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
+                                <option value="<?= /* @noEscape */ $k ? $escaper->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-                                    <?= $block->escapeHtml($v) ?>
+                                    <?= $escaper->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
                             </select>
@@ -142,13 +147,13 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
         <?php if ($block->hasVerification()): ?>
         <div class="field required cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
-                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="control">
                 <input id="<?= /* @noEscape */ $code ?>_cc_cid"
                        name="payment[cc_cid]"
                        type="number"
-                       title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                       title="<?= $escaper->escapeHtml(__('Card Verification Number')) ?>"
                        data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        class="input-text cvv"
                        value=""
@@ -173,10 +178,10 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                 ) ?>
                 <div class="note">
                     <a href="#" id="<?= /* @noEscape */ $code ?>-cvv-what-is-this" class="action cvv"
-                       title="<?= $block->escapeHtml(__('What is this?')) ?>" data-mage-init='{
+                       title="<?= $escaper->escapeHtml(__('What is this?')) ?>" data-mage-init='{
                            "tooltip": {"content": "<?= /* @noEscape */ $content ?>"}
                        }'>
-                        <span><?= $block->escapeHtml(__('What is this?')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('What is this?')) ?></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index ac4cd87eb9962..ad6fad0f87291 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Payment\Block\Transparent\Iframe $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Iframe;
 
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var Iframe $block */
 $params = $block->getParams();
 ?>
 <html>
@@ -14,7 +19,7 @@ $params = $block->getParams();
         <?php $scriptString = '' ?>
         <?php if (isset($params['redirect'])): ?>
             <?php $scriptString .= <<<script
-            window.location="{$block->escapeJs($params['redirect'])}";
+            window.location="{$escaper->escapeJs($params['redirect'])}";
 script;
             ?>
         <?php elseif (isset($params['redirect_parent'])): ?>
@@ -27,7 +32,7 @@ script;
                 function($) {
                     var parent = window.parent;
                     $(parent).trigger('clearTimeout');
-                    parent.location="{$block->escapeJs($params['redirect_parent'])}";
+                    parent.location="{$escaper->escapeJs($params['redirect_parent'])}";
                 }
             );
 script;
@@ -72,7 +77,7 @@ script;
             ?>
         <?php elseif (isset($params['order_success'])): ?>
             <?php $scriptString .= <<<script
-            window.parent.location = "{$block->escapeJs($params['order_success'])}";
+            window.parent.location = "{$escaper->escapeJs($params['order_success'])}";
 script;
             ?>
         <?php else: ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
index 49c35e844c39a..a869c4b40d661 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
@@ -3,19 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * @var \Magento\Payment\Block\Transparent\Info $block
- * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
- * @see \Magento\Payment\Block\Transparent\Info
- */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Payment\Block\Transparent\Info;
+
+/** @var Escaper $escaper */
+/** @var Info $block */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @see Info */
 ?>
-<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
+<fieldset id="payment_form_<?= $escaper->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
     <div>
-        <?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?>
+        <?= $escaper->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?>
     </div>
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+    'fieldset#payment_form_' . $escaper->escapeHtml($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/redirect.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/redirect.phtml
index 17fbdf780a40a..f16d30fe99dc8 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/redirect.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/redirect.phtml
@@ -3,18 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Payment\Block\Transparent\Redirect $block */
+use Magento\Framework\Escaper;
+use Magento\Payment\Block\Transparent\Redirect;
+
+/** @var Escaper $escaper */
+/** @var Redirect $block */
 $params = $block->getPostParams();
 $redirectUrl = $block->getRedirectUrl();
 ?>
 <html>
 <head></head>
 <body onload="document.forms['proxy_form'].submit()">
-<form id="proxy_form" action="<?= $block->escapeUrl($redirectUrl) ?>"
+<form id="proxy_form" action="<?= $escaper->escapeUrl($redirectUrl) ?>"
       method="POST" hidden enctype="application/x-www-form-urlencoded" class="no-display">
     <?php foreach ($params as $name => $value):?>
-        <input value="<?= $block->escapeHtmlAttr($value) ?>" name="<?= $block->escapeHtmlAttr($name) ?>" type="hidden"/>
+        <input value="<?= $escaper->escapeHtmlAttr($value) ?>" name="<?= $escaper->escapeHtmlAttr($name) ?>" type="hidden"/>
     <?php endforeach?>
 </form>
 </body>