MAGETWO-99482: Use escaper methods

cspruiell · cspruiell · commit 953ed9c8f575 · 2019-05-07T16:53:43.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
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -44,7 +41,7 @@
 
         <div class="control">
             <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
-                $block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
+                $block->escapeHtml($block->toJson([
                     'rolesTree' => [
                         "treeInitData" => $block->getTree(),
                         "treeInitSelectedData" => $block->getSelectedResources(),
diff --git a/app/code/Magento/User/ViewModel/ForgotPasswordUrlProvider.php b/app/code/Magento/User/ViewModel/ForgotPasswordUrlProvider.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\ViewModel;
+
+use Magento\Backend\Model\UrlInterface;
+
+/**
+ * Provides Forgot Password Url
+ */
+class ForgotPasswordUrlProvider implements \Magento\Framework\View\Element\Block\ArgumentInterface
+{
+
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    private $backendUrl;
+
+    /**
+     * @param UrlInterface $backendUrl
+     */
+    public function __construct(UrlInterface $backendUrl)
+    {
+        $this->backendUrl = $backendUrl;
+    }
+
+    /**
+     * @param string $route
+     * @param array $params
+     * @return string
+     */
+    public function getUrl($route = '', $params = [])
+    {
+        return $this->backendUrl->getUrl($route, $params);
+    }
+}
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,7 +8,11 @@
 <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"/>
+            <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>
         </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
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="links">
-<a class="action-forgotpassword" href="<?= $block->escapeUrl($this->helper(\Magento\Backend\Helper\Data::class)->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Forgot your password?')) ?></a>
+<a class="action-forgotpassword" href="<?= $block->escapeUrl(
+    $block->getViewModel()->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
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -45,7 +42,7 @@
         <div class="control">
             <div class="tree x-tree" data-role="resource-tree"
                  data-mage-init='<?= $block->escapeHtml(
-                     $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(
+                     $block->toJson(
                          [
                              'rolesTree' => [
                                  "treeInitData" => $block->getTree(),
