Merge branch 'MAGETWO-39021' into sprint58

Author: Dmytro Voskoboinikov

app/code/Magento/Backend/Model/Url.php

@@ -86,6 +86,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor
      * @param string $scopeType
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param Menu\Config $menuConfig
@@ -108,6 +109,7 @@ public function __construct(
         \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory,
         \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor,
         $scopeType,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\Backend\Model\Menu\Config $menuConfig,
@@ -129,6 +131,7 @@ public function __construct(
             $routeParamsResolverFactory,
             $queryParamsResolver,
             $scopeConfig,
+            $routeParamsPreprocessor,
             $scopeType,
             $data
         );

app/etc/di.xml

@@ -121,6 +121,7 @@
     <preference for="Magento\Framework\Session\StorageInterface" type="Magento\Framework\Session\Storage" />
     <preference for="Magento\Framework\App\Request\DataPersistorInterface" type="Magento\Framework\App\Request\DataPersistor" />
     <preference for="Magento\Framework\Url\RouteParamsResolverInterface" type="Magento\Framework\Url\RouteParamsResolver" />
+    <preference for="Magento\Framework\Url\RouteParamsPreprocessorInterface" type="Magento\Framework\Url\RouteParamsPreprocessorComposite" />
     <preference for="Magento\Framework\Url\QueryParamsResolverInterface" type="Magento\Framework\Url\QueryParamsResolver" />
     <preference for="Magento\Framework\Url\ScopeResolverInterface" type="Magento\Framework\Url\ScopeResolver" />
     <preference for="Magento\Framework\Url\SecurityInfoInterface" type="Magento\Framework\Url\SecurityInfo\Proxy" />

lib/internal/Magento/Framework/Url.php

@@ -162,6 +162,11 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      */
     protected $_scopeConfig;
 
+    /**
+     * @var \Magento\Framework\Url\RouteParamsPreprocessorInterface
+     */
+    protected $routeParamsPreprocessor;
+
     /**
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\App\RequestInterface $request
@@ -172,6 +177,7 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      * @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor
      * @param string $scopeType
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -186,6 +192,7 @@ public function __construct(
         \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory,
         \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor,
         $scopeType,
         array $data = []
     ) {
@@ -198,6 +205,7 @@ public function __construct(
         $this->_routeParamsResolverFactory = $routeParamsResolverFactory;
         $this->_queryParamsResolver = $queryParamsResolver;
         $this->_scopeConfig = $scopeConfig;
+        $this->routeParamsPreprocessor = $routeParamsPreprocessor;
         $this->_scopeType = $scopeType;
         parent::__construct($data);
     }
@@ -792,6 +800,9 @@ public function getUrl($routePath = null, $routeParams = null)
             return $routePath;
         }
 
+        $routeParams = $this->routeParamsPreprocessor
+            ->execute($this->_scopeResolver->getAreaCode(), $routePath, $routeParams);
+
         $isCached = true;
         $isArray = is_array($routeParams);
 

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

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Url;
+
+/**
+ * Route parameters composite preprocessor.
+ */
+class RouteParamsPreprocessorComposite implements RouteParamsPreprocessorInterface
+{
+    /**
+     * @var RouteParamsPreprocessorInterface[]
+     */
+    private $routeParamsPreprocessors;
+
+    /**
+     * @param RouteParamsPreprocessorInterface[] $routeParamsPreprocessors
+     */
+    public function __construct(array $routeParamsPreprocessors = [])
+    {
+        $this->routeParamsPreprocessors = $routeParamsPreprocessors;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute($areaCode, $routePath, $routeParams)
+    {
+        foreach ($this->routeParamsPreprocessors as $preprocessor) {
+            $routeParams = $preprocessor->execute($areaCode, $routePath, $routeParams);
+        }
+
+        return $routeParams;
+    }
+}

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

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Url;
+
+/**
+ * Route parameters preprocessor interface.
+ */
+interface RouteParamsPreprocessorInterface
+{
+    /**
+     * Processes route params.
+     *
+     * @param string $areaCode
+     * @param string|null $routePath
+     * @param array|null $routeParams
+     * @return array|null
+     */
+    public function execute($areaCode, $routePath, $routeParams);
+}