MAGETWO-54849: Refactor \Magento\Framework\Url::escape to use \Magento\Framework\Escaper::escapeUrl

Refactoring Url class

app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php

@@ -170,7 +170,12 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
     {
         return $this->getUrl(
             'adminhtml/*/*',
-            ['_current' => true, 'code' => '<%- data.code %>', 'theme_id' => '<%- data.theme_id %>']
+            [
+                '_current' => true,
+                'code' => '<%- data.code %>',
+                'theme_id' => '<%- data.theme_id %>',
+                '_escape_params' => false
+            ]
         );
     }
 

lib/internal/Magento/Framework/Url.php

@@ -867,6 +867,7 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
     private function createUrl($routePath = null, array $routeParams = null)
     {
         $escapeQuery = false;
+        $escapeParams = true;
 
         /**
          * All system params should be unset before we call getRouteUrl
@@ -885,6 +886,12 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
             unset($routeParams['_escape']);
         }
 
+        if (isset($routeParams['_escape_params'])) {
+            $escapeParams = $routeParams['_escape_params'];
+            unset($routeParams['_escape_params']);
+        }
+        $this->getRouteParamsResolver()->setData('escape_params', $escapeParams);
+
         $query = null;
         if (isset($routeParams['_query'])) {
             $this->_queryParamsResolver->setQueryParams([]);
@@ -929,6 +936,7 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
             $url .= '#' . $this->getEscaper()->escapeUrl($fragment);
         }
         $this->getRouteParamsResolver()->unsetData('secure');
+        $this->getRouteParamsResolver()->unsetData('escape_params');
 
         return $url;
     }

lib/internal/Magento/Framework/Url/RouteParamsResolver.php

@@ -93,7 +93,7 @@ class RouteParamsResolver extends \Magento\Framework\DataObject implements Route
                     if (array_key_exists($key, $data) || $this->getRouteParam($key)) {
                         continue;
                     }
-                    $data[$this->getEscaper()->escapeUrl($key)] = $this->getEscaper()->escapeUrl($value);
+                    $data[$key] = $value;
                 }
                 foreach ($this->request->getQuery() as $key => $value) {
                     $this->queryParamsResolver->setQueryParam($key, $value);
@@ -111,9 +111,20 @@ class RouteParamsResolver extends \Magento\Framework\DataObject implements Route
                 $this->setRouteParam($key, $value);
             } else {
                 if (is_object($value)) {
-                    $this->setRouteParam($this->getEscaper()->escapeUrl($key), $value);
+                    if ($this->getData('escape_params')) {
+                        $this->setRouteParam($this->getEscaper()->escapeUrl($key), $value);
+                    } else {
+                        $this->setRouteParam($key, $value);
+                    }
                 } else {
-                    $this->setRouteParam($this->getEscaper()->escapeUrl($key), $this->getEscaper()->escapeUrl($value));
+                    if ($this->getData('escape_params')) {
+                        $this->setRouteParam(
+                            $this->getEscaper()->escapeUrl($key),
+                            $this->getEscaper()->escapeUrl($value)
+                        );
+                    } else {
+                        $this->setRouteParam($key, $value);
+                    }
                 }
             }
         }