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

---
 .../view/adminhtml/templates/promo/fieldset.phtml     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
index e1229dc56cfbf..35e489a5b431d 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -4,19 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-/**@var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block */
+/**
+ * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_element = $block->getElement() ?>
 <?php $_jsObjectName = $block->getFieldSetId() != null ? $block->getFieldSetId() : $_element->getHtmlId() ?>
 <div class="rule-tree">
-<fieldset id="<?= $block->escapeHtmlAttr($_jsObjectName) ?>" <?= /* @noEscape */ $_element->serialize(['class']) ?>
+<fieldset id="<?= $escaper->escapeHtmlAttr($_jsObjectName) ?>" <?= /* @noEscape */ $_element->serialize(['class']) ?>
           class="fieldset">
-        <legend class="legend"><span><?= $block->escapeHtml($_element->getLegend()) ?></span></legend>
+        <legend class="legend"><span><?= $escaper->escapeHtml($_element->getLegend()) ?></span></legend>
         <br>
     <?php if ($_element->getComment()): ?>
         <div class="messages">
-            <div class="message message-notice"><?= $block->escapeHtml($_element->getComment()) ?></div>
+            <div class="message message-notice"><?= $escaper->escapeHtml($_element->getComment()) ?></div>
         </div>
     <?php endif; ?>
     <div class="rule-tree-wrapper">