From 32c64508fd324b510692b75a3a233a8c5e3739f5 Mon Sep 17 00:00:00 2001
From: sergey <sergey.nezbritskiy@gmail.com>
Date: Sat, 16 Jan 2021 15:08:04 +0200
Subject: [PATCH] Magento_Marketplace: avoid using deprecated escape* methods
 from AbstractBlock

---
 .../view/adminhtml/templates/index.phtml      | 22 +++++++++----------
 .../view/adminhtml/templates/partners.phtml   | 18 +++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
index ac39d72388e6c..879acdbd3dad7 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -6,9 +6,9 @@
 ?>
 
 <section class="page-partners">
-    <h2 class="page-sub-title"><?= $block->escapeHtml(__('Platinum Partners')) ?></h2>
+    <h2 class="page-sub-title"><?= $escaper->escapeHtml(__('Platinum Partners')) ?></h2>
     <p class="partners-description">
-        <?= $block->escapeHtml(__(
+        <?= $escaper->escapeHtml(__(
             'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established ' .
             'themselves as leaders and innovators of key products and services designed to help merchants and brands ' .
             'grow their business. Magento reserves the Platinum level for select trusted partners that are committed ' .
@@ -16,7 +16,7 @@
             'operations, to extend and enhance the power of the Magento commerce platform.'
         )); ?>
     </p>
-    <h3 class="page-sub-sub-title"><?= $block->escapeHtml(__('Featured Platinum Partners')) ?></h3>
+    <h3 class="page-sub-sub-title"><?= $escaper->escapeHtml(__('Featured Platinum Partners')) ?></h3>
     <div data-role="partners-block" class="partners-block">
         <div data-role="spinner" class="admin__data-grid-loading-mask">
             <div class="spinner">
@@ -29,9 +29,9 @@
     <div class="row row-gutter partners-footer">
         <div class="col-m-5">
             <div class="partners-search">
-                <h2 class="page-sub-title"><?= $block->escapeHtml(__('Partner search')) ?></h2>
+                <h2 class="page-sub-title"><?= $escaper->escapeHtml(__('Partner search')) ?></h2>
                 <p>
-                    <?= $block->escapeHtml(__(
+                    <?= $escaper->escapeHtml(__(
                         'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver ' .
                         'the best possible customer experiences. They are recognized as experts in eCommerce, ' .
                         'search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, ' .
@@ -40,21 +40,21 @@
                 </p>
                 <a class="action-secondary" target="_blank"
                    href="http://partners.magento.com/partner_locator/search.aspx">
-                    <?= $block->escapeHtml(__('More Partners')) ?>
+                    <?= $escaper->escapeHtml(__('More Partners')) ?>
                 </a>
             </div>
         </div>
         <div class="col-m-3">
             <img
                 class="magento-marketplace-logo"
-                src="<?= $block->escapeUrl($block
+                src="<?= $escaper->escapeUrl($block
                     ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg')); ?>"
                 alt="Partner"/>
         </div>
         <div class="col-m-4">
-            <h2 class="page-sub-title"><?= $block->escapeHtml(__('Magento Marketplace')) ?></h2>
+            <h2 class="page-sub-title"><?= $escaper->escapeHtml(__('Magento Marketplace')) ?></h2>
             <p class="partner-description">
-                <?= $block->escapeHtml(__(
+                <?= $escaper->escapeHtml(__(
                     'Extensions and Themes are an essential component of the Magento Ecosystem. ' .
                     'Please visit the Magento Marketplace to see the latest innovations that developers have ' .
                     'created to enhance your Magento Store.'
@@ -62,7 +62,7 @@
             </p>
             <a class="action-secondary" target="_blank"
                href="https://marketplace.magento.com/">
-                <?= $block->escapeHtml(__('Visit Magento Marketplaces')) ?>
+                <?= $escaper->escapeHtml(__('Visit Magento Marketplaces')) ?>
             </a>
         </div>
     </div>
@@ -73,7 +73,7 @@
     {
         "*": {
             "Magento_Marketplace/default": {
-                "url": "<?= $block->escapeUrl($block->getUrl(
+                "url": "<?= $escaper->escapeUrl($block->getUrl(
                     'marketplace/partners/index',
                     ['_current' => true, 'block' => '', 'period' => '']
                 )) ?>"
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
index 924d6fd7410a5..c1f2ecaeb32a5 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -12,24 +12,24 @@ $partners = $block->getPartners();
         <div class="partner">
             <img
                 class="partner-image"
-                src="<?= $block->escapeHtml($partner['img']) ?>"
-                alt="<?= $block->escapeHtml($partner['title']) ?>"/>
-            <h3 class="partner-title"><?= $block->escapeHtml($partner['title']) ?></h3>
+                src="<?= $escaper->escapeHtml($partner['img']) ?>"
+                alt="<?= $escaper->escapeHtml($partner['title']) ?>"/>
+            <h3 class="partner-title"><?= $escaper->escapeHtml($partner['title']) ?></h3>
             <p class="partner-description">
-                <?= $block->escapeHtml($partner['description']) ?>
+                <?= $escaper->escapeHtml($partner['description']) ?>
                 <br />
-                <a href="<?= $block->escapeHtml($partner['url_page']) ?>" target="_blank">
-                    <?= $block->escapeHtml(__('Read More')) ?>
+                <a href="<?= $escaper->escapeHtml($partner['url_page']) ?>" target="_blank">
+                    <?= $escaper->escapeHtml(__('Read More')) ?>
                 </a>
                 <br />
-                <a href="<?= $block->escapeHtml($partner['url_partner_page']) ?>" target="_blank">
-                    <?= $block->escapeHtml(__('Partner Page')) ?>
+                <a href="<?= $escaper->escapeHtml($partner['url_partner_page']) ?>" target="_blank">
+                    <?= $escaper->escapeHtml(__('Partner Page')) ?>
                 </a>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else : ?>
     <p>
-        <?= $block->escapeHtml(__('No partners were found')) ?>
+        <?= $escaper->escapeHtml(__('No partners were found')) ?>
     </p>
 <?php endif; ?>