Merge remote-tracking branch 'tango/result_factory' into MAGETWO-36113

Author: Dmytro Poperechnyy

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\App\Action;
 
+use Magento\Framework\Controller\ResultFactory;
+
 /**
  * Backend Controller context
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +64,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\Controller\ResultFactory $resultFactory
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Auth $auth
@@ -83,6 +86,7 @@ public function __construct(
         \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        ResultFactory $resultFactory,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Auth $auth,
@@ -102,7 +106,8 @@ public function __construct(
             $actionFlag,
             $view,
             $messageManager,
-            $resultRedirectFactory
+            $resultRedirectFactory,
+            $resultFactory
         );
 
         $this->_session = $session;

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -90,6 +90,24 @@
             <argument name="instanceName" xsi:type="string">Magento\Backend\Model\View\Result\Page</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Controller\ResultFactory">
+        <arguments>
+            <argument name="typeMap" xsi:type="array">
+                <item name="redirect" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT</item>
+                    <item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Redirect</item>
+                </item>
+                <item name="page" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_PAGE</item>
+                    <item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Page</item>
+                </item>
+                <item name="forward" xsi:type="array">
+                    <item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_FORWARD</item>
+                    <item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Forward</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\View\Layout\BuilderFactory">
         <arguments>
             <argument name="typeMap" xsi:type="array">

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

@@ -24,6 +24,11 @@ abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
      */
     protected $resultRedirectFactory;
 
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory
+     */
+    protected $resultFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      */
@@ -33,6 +38,7 @@ public function __construct(
         $this->_request = $context->getRequest();
         $this->_response = $context->getResponse();
         $this->resultRedirectFactory = $context->getResultRedirectFactory();
+        $this->resultFactory = $context->getResultFactory();
     }
 
     /**

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\App\Action;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
@@ -57,6 +59,11 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      */
     protected $resultRedirectFactory;
 
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory
+     */
+    protected $resultFactory;
+
     /**
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\App\ResponseInterface $response
@@ -68,6 +75,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\Controller\ResultFactory $resultFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -81,7 +89,8 @@ public function __construct(
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\Message\ManagerInterface $messageManager,
-        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+        ResultFactory $resultFactory
     ) {
         $this->_request = $request;
         $this->_response = $response;
@@ -93,6 +102,7 @@ public function __construct(
         $this->_view = $view;
         $this->messageManager = $messageManager;
         $this->resultRedirectFactory = $resultRedirectFactory;
+        $this->resultFactory = $resultFactory;
     }
 
     /**
@@ -174,4 +184,12 @@ public function getResultRedirectFactory()
     {
         return $this->resultRedirectFactory;
     }
+
+    /**
+     * @return \Magento\Framework\Controller\ResultFactory
+     */
+    public function getResultFactory()
+    {
+        return $this->resultFactory;
+    }
 }