MAGETWO-33609: pull request for stories in this sprint

Author: Dale Sikkema

app/code/Magento/Backend/App/Router.php

@@ -53,10 +53,9 @@ class Router extends \Magento\Framework\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
-     * @param \Magento\Framework\App\Router\SecureUrlInterface $secureUrl
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      *
@@ -69,10 +68,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
-        \Magento\Framework\App\Router\SecureUrlInterface $secureUrl,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
@@ -83,10 +81,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $scopeConfig,
             $routerId,
             $nameBuilder,
-            $secureUrl
+            $pathConfig
         );
         $this->_coreConfig = $coreConfig;
         $this->_backendConfig = $backendConfig;

app/code/Magento/Backend/Model/Config/Backend/Baseurl.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Backend\Model\Config\Backend;
 
-use Magento\Store\Model\StoreManagerInterface;
-
 class Baseurl extends \Magento\Framework\App\Config\Value
 {
     /**

app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php

@@ -47,10 +47,9 @@ class Standard extends \Magento\Framework\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\Config $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
-     * @param \Magento\Framework\App\Router\SecureUrlInterface $secureUrl
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\RouterListInterface $routerList
      * @param \Magento\DesignEditor\Helper\Data $designEditorHelper
      * @param \Magento\DesignEditor\Model\State $designEditorState
@@ -65,10 +64,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\Config $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
-        \Magento\Framework\App\Router\SecureUrlInterface $secureUrl,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\RouterListInterface $routerList,
         \Magento\DesignEditor\Helper\Data $designEditorHelper,
         \Magento\DesignEditor\Model\State $designEditorState,
@@ -81,10 +79,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $scopeConfig,
             $routerId,
             $nameBuilder,
-            $secureUrl
+            $pathConfig
         );
         $this->_routerList = $routerList;
         $this->_designEditorHelper = $designEditorHelper;

app/code/Magento/Store/Model/SecureUrl.php renamed to app/code/Magento/Store/Model/PathConfig.php

@@ -5,11 +5,7 @@
  */
 namespace Magento\Store\Model;
 
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\Store;
-
-class SecureUrl implements \Magento\Framework\App\Router\SecureUrlInterface
+class PathConfig implements \Magento\Framework\App\Router\PathConfigInterface
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     private $scopeConfig;
@@ -72,4 +68,14 @@ public function shouldBeSecure($path)
             PHP_URL_SCHEME
         ) == 'https' && $this->urlSecurityInfo->isSecure($path);
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getDefaultPath()
+    {
+        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+    }
 }

app/code/Magento/Store/etc/di.xml

@@ -56,7 +56,7 @@
     </type>
     <preference for="Magento\Framework\App\Config\Scope\ReaderPoolInterface" type="Magento\Store\Model\Config\Reader\ReaderPool"/>
     <preference for="Magento\Framework\App\ScopeResolverInterface" type="Magento\Store\Model\Resolver\Store" />
-    <preference for="Magento\Framework\App\Router\SecureUrlInterface" type="Magento\Store\Model\SecureUrl" />
+    <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\Action\Action">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
         <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>

app/code/Magento/Translation/composer.json

@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/module-developer": "0.42.0-beta8",
         "magento/module-store": "0.42.0-beta8",
         "magento/module-theme": "0.42.0-beta8",

app/code/Magento/Version/composer.json

@@ -7,7 +7,7 @@
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.42.0-beta7",
+    "version": "0.42.0-beta8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

dev/tests/unit/testsuite/Magento/Store/Model/SecureUrlTest.php renamed to dev/tests/unit/testsuite/Magento/Store/Model/PathConfigTest.php

@@ -13,7 +13,7 @@
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\ObjectManager;
 
-class SecureUrlTest extends \PHPUnit_Framework_TestCase
+class PathConfigTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject*/
     private $scopeConfigMock;
@@ -23,7 +23,7 @@ class SecureUrlTest extends \PHPUnit_Framework_TestCase
     private $storeManagerMock;
     /** @var Store | \PHPUnit_Framework_MockObject_MockObject*/
     private $storeMock;
-    /** @var \Magento\Store\Model\SecureUrl */
+    /** @var \Magento\Store\Model\RouteConfig */
     protected $model;
 
     public function setUp()
@@ -45,7 +45,7 @@ public function setUp()
             'urlSecurityInfo' => $this->urlSecurityInfoMock,
             'storeManager' => $this->storeManagerMock,
         ];
-        $this->model = (new ObjectManager($this))->getObject('\Magento\Store\Model\SecureUrl', $mockArgs);
+        $this->model = (new ObjectManager($this))->getObject('\Magento\Store\Model\PathConfig', $mockArgs);
     }
 
     public function testGetCurrentSecureUrlNoAlias()

dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AllcartTest.php

@@ -19,7 +19,7 @@ class AllcartTest extends \PHPUnit_Framework_TestCase
     protected $itemCarrier;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $formKeyValidator;
 
@@ -43,7 +43,7 @@ protected function setUp()
         $this->context = $this->getMock('Magento\Framework\App\Action\Context', [], [], '', false);
         $this->wishlistProvider = $this->getMock('Magento\Wishlist\Controller\WishlistProvider', [], [], '', false);
         $this->itemCarrier = $this->getMock('Magento\Wishlist\Model\ItemCarrier', [], [], '', false);
-        $this->formKeyValidator = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
+        $this->formKeyValidator = $this->getMock('Magento\Framework\Data\Form\FormKey\Validator', [], [], '', false);
         $this->request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
         $this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
     }

lib/internal/Magento/Framework/App/Router/Base.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -110,8 +109,8 @@ class Base implements \Magento\Framework\App\RouterInterface
      */
     protected $actionList;
 
-    /** @var SecureUrlInterface */
-    private $secureUrl;
+    /** @var PathConfigInterface */
+    protected $pathConfig;
 
     /**
      * @param \Magento\Framework\App\Router\ActionList $actionList
@@ -120,10 +119,9 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
-     * @param \Magento\Framework\App\Router\SecureUrlInterface $secureUrl
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      *
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -136,20 +134,18 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
-        \Magento\Framework\App\Router\SecureUrlInterface $secureUrl
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig
     ) {
         $this->actionList = $actionList;
         $this->actionFactory = $actionFactory;
         $this->_responseFactory = $responseFactory;
         $this->_defaultPath = $defaultPath;
         $this->_routeConfig = $routeConfig;
-        $this->_scopeConfig = $scopeConfig;
         $this->_url = $url;
         $this->nameBuilder = $nameBuilder;
-        $this->secureUrl = $secureUrl;
+        $this->pathConfig = $pathConfig;
     }
 
     /**
@@ -177,7 +173,7 @@ protected function parseRequest(\Magento\Framework\App\RequestInterface $request
 
         $path = trim($request->getPathInfo(), '/');
 
-        $params = explode('/', $path ? $path : $this->_getDefaultPath());
+        $params = explode('/', $path ? $path : $this->pathConfig->getDefaultPath());
         foreach ($this->_requiredParams as $paramName) {
             $output[$paramName] = array_shift($params);
         }
@@ -326,16 +322,6 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
         return $actionInstance;
     }
 
-    /**
-     * Get router default request path
-     *
-     * @return string
-     */
-    protected function _getDefaultPath()
-    {
-        return $this->_scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
-    }
-
     /**
      * Build controller class name
      *
@@ -364,8 +350,8 @@ protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface
             return;
         }
 
-        if ($this->secureUrl->shouldBeSecure($path) && !$request->isSecure()) {
-            $url = $this->secureUrl->getCurrentSecureUrl($request);
+        if ($this->pathConfig->shouldBeSecure($path) && !$request->isSecure()) {
+            $url = $this->pathConfig->getCurrentSecureUrl($request);
             if ($this->_shouldRedirectToSecure()) {
                 $url = $this->_url->getRedirectUrl($url);
             }