MAGETWO-56444: UI-Related Modules Template Update

- Resolved incorrectly escaped templates

Author: Hwashiang Yu

app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml

@@ -62,7 +62,7 @@ jQuery(function($) {
     $('body').trigger(
         'refreshJsList',
         {
-            jsList: <?= $block->escapeJs($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles())) ?>
+            jsList: <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>
         }
     );
 });

app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml

@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?= $block->getMiscellaneousHtml();
+<?= /* @noEscape */ $block->getMiscellaneousHtml();

app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml

@@ -20,7 +20,7 @@ $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAl
     <img src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
          title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
          alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
-         <?= $block->escapeHtml($block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '') ?>
-         <?= $block->escapeHtml($block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '') ?>
+         <?= $block->getLogoWidth() ? 'width="' . $block->escapeHtmlAttr($block->getLogoWidth()) . '"' : '' ?>
+         <?= $block->getLogoHeight() ? 'height="' . $block->escapeHtmlAttr($block->getLogoHeight()) . '"' : '' ?>
     />
 </a>

app/code/Magento/Theme/view/frontend/templates/text.phtml

@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-$attributes = $block->getCssClass() ? ' class="' . $block->getCssClass() . '"' : '';
+// @codingStandardsIgnoreFile
+
+$attributes = $block->getCssClass() ? ' class="' . $block->escapeHtmlAttr($block->getCssClass()) . '"' : '';
 $attr = $block->getAttributes();
 if (!empty($attr)) {
     foreach ($block->getAttributes() as $attribute => $value) {
-        $attributes .= ' ' . $attribute . '="' . $value . '"';
+        $attributes .= ' ' . $block->escapeHtml($attribute) . '="' . $block->escapeHtmlAttr($value) . '"';
     }
 }
-?>
-<?=
-    '<'
+/* @noEscape */ echo '<'
     . $block->escapeHtml($block->getTag())
-    . $block->escapeHtml($attributes)
+    . $attributes
     . '>'
     . $block->escapeHtml($block->getText())
     . '</'

app/code/Magento/Ui/view/base/templates/form/default.phtml

@@ -8,7 +8,7 @@
  * @var \Magento\Ui\Component\Form $block
  */
 ?>
-<?= $block->escapeHtml($block->renderChildComponent('before_form')) ?>
+<?=/* @noEscape */ $block->renderChildComponent('before_form') ?>
 <div data-role="spinner"
      data-component="<?= $block->escapeHtmlAttr($block->getName()) ?>.areas"
      class="admin__data-grid-loading-mask">
@@ -18,4 +18,4 @@
      class="entry-edit form-inline">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
-<?= $block->escapeHtml($block->renderChildComponent('after_form')) ?>
+<?= /* @noEscape */ $block->renderChildComponent('after_form') ?>

app/code/Magento/Ui/view/base/templates/logger.phtml

@@ -11,7 +11,7 @@
 <?php if ($block->isLoggingEnabled()): ?>
     <script>
         window.onerror = function(msg, url, line) {
-            var key = "<?= $block->escapeHtmlAttr($block->getSessionStorageKey()) ?>";
+            var key = "<?= $block->escapeJs($block->getSessionStorageKey()) ?>";
             var errors = {};
             if (sessionStorage.getItem(key)) {
                 errors = JSON.parse(sessionStorage.getItem(key));