Merge branch 'MAGETWO-26762' into MAGETWO-34990

Author: vpaladiychuk

app/code/Magento/Backend/App/Action/Context.php

@@ -61,6 +61,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Auth $auth
@@ -82,6 +83,7 @@ public function __construct(
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Auth $auth,

app/code/Magento/Backend/Model/View/Result/RedirectFactory.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\ObjectManagerInterface;
 
+/**
+ * Factory class for \Magento\Backend\Model\View\Result\Redirect
+ */
 class RedirectFactory extends \Magento\Framework\Controller\Result\RedirectFactory
 {
     /**

lib/internal/Magento/Framework/App/Action/AbstractAction.php

@@ -19,11 +19,6 @@ abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
      */
     protected $_response;
 
-    /**
-     * @var \Magento\Framework\App\Action\Context $context
-     */
-    protected $context;
-
     /**
      * @var \Magento\Framework\Controller\Result\RedirectFactory
      */
@@ -41,7 +36,6 @@ public function __construct(
     ) {
         $this->_request = $request;
         $this->_response = $response;
-        $this->context = $context;
         $this->resultRedirectFactory = $context->getResultRedirectFactory();
     }
 
@@ -68,7 +62,7 @@ public function getResponse()
     /**
      * Redirect user to the previous or main page
      *
-     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function getDefaultRedirect()
     {

lib/internal/Magento/Framework/App/ActionInterface.php

@@ -36,9 +36,9 @@ public function dispatch(RequestInterface $request);
     public function getResponse();
 
     /**
-     * Redirect to custom, previous or main page
+     * Get default redirect object
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function getDefaultRedirect();
 }

lib/internal/Magento/Framework/App/FrontController.php

@@ -68,7 +68,6 @@ public function dispatch(RequestInterface $request)
         $result = null;
         while (!$request->isDispatched() && $routingCycleCounter++ < 100) {
             $result = $this->matchAction($request);
-
         }
         \Magento\Framework\Profiler::stop('routers_match');
         if ($routingCycleCounter > 100) {
@@ -100,6 +99,7 @@ protected function handleException($e, $actionInstance, $message)
      */
     protected function matchAction(RequestInterface $request)
     {
+        $result = null;
         /** @var \Magento\Framework\App\RouterInterface $router */
         foreach ($this->_routerList as $router) {
             try {
@@ -115,7 +115,7 @@ protected function matchAction(RequestInterface $request)
                 $request->setActionName('noroute');
                 $request->setDispatched(false);
                 break;
-            } catch (\Magento\Framework\LocalizedException $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $result = $this->handleException($e, $actionInstance, $e->getMessage());
                 break;
             } catch (\Exception $e) {