MAGETWO-99482: Use escaper methods

cspruiell · cspruiell · commit f82b2cb40805 · 2019-05-08T10:58:44.000-05:00
- refactored $this-&gt;helper out of templates
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -7,6 +7,7 @@
 
 <?php
 /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
+$serializer = new \Magento\Framework\Serialize\Serializer\Json();
 ?>
 
 <?= $block->getChildHtml() ?>
@@ -41,12 +42,12 @@
 
         <div class="control">
             <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
-                $block->escapeHtml($block->toJson([
+                $serializer->serialize([
                     'rolesTree' => [
                         "treeInitData" => $block->getTree(),
                         "treeInitSelectedData" => $block->getSelectedResources(),
                     ],
-                ])); ?>'>
+                ]); ?>'>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/User/ViewModel/ForgotPasswordUrlProvider.php b/app/code/Magento/User/ViewModel/ForgotPasswordUrlProvider.php
diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_login.xml
@@ -8,11 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="form.buttons">
-            <block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_forgotpassword" template="Magento_User::admin/forgotpassword_url.phtml">
-                <arguments>
-                    <argument name="view_model" xsi:type="object">Magento\User\ViewModel\ForgotPasswordUrlProvider</argument>
-                </arguments>
-            </block>
+            <block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_forgotpassword" template="Magento_User::admin/forgotpassword_url.phtml"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
@@ -5,8 +5,8 @@
  */
 ?>
 <div class="links">
-<a class="action-forgotpassword" href="<?= $block->escapeUrl(
-    $block->getViewModel()->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])
-) ?>"><?= $block->escapeHtml(__('Forgot your password?')) ?>
+<a class="action-forgotpassword"
+   href="<?= $block->escapeUrl($block->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>">
+    <?= $block->escapeHtml(__('Forgot your password?')) ?>
 </a>
 </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -7,6 +7,7 @@
 
 <?php
 /** @var $block \Magento\User\Block\Role\Tab\Edit */
+$serializer = new \Magento\Framework\Serialize\Serializer\Json();
 ?>
 
 <?= $block->getChildHtml() ?>
@@ -40,17 +41,13 @@
         <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
 
         <div class="control">
-            <div class="tree x-tree" data-role="resource-tree"
-                 data-mage-init='<?= $block->escapeHtml(
-                     $block->toJson(
-                         [
-                             'rolesTree' => [
-                                 "treeInitData" => $block->getTree(),
-                                 "treeInitSelectedData" => $block->getSelectedResources(),
-                             ],
-                         ]
-                     )
-                 ); ?>'>
+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
+                $serializer->serialize([
+                    'rolesTree' => [
+                        "treeInitData" => $block->getTree(),
+                        "treeInitSelectedData" => $block->getSelectedResources(),
+                    ],
+                ]); ?>'>
             </div>
         </div>
     </div>
