MC-16608: Use escaper methods

 - clean up code

Author: cspruiell

app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml

@@ -122,7 +122,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
         // add existing rows
         <?php
         foreach ($block->getArrayRows() as $_rowId => $_row) {
-            echo /* @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /* @noEscape */ $_row->toJson() . ");\n";
+            echo /** @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /** @noEscape */ $_row->toJson() . ");\n";
         }
         ?>
 

app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml

@@ -72,7 +72,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                     <?php if ($_item->isSaleable()) : ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeHtmlAttr($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}'
                                                                     type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
                                                                 <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>