Merge remote-tracking branch 'tango-ce/result_factory' into MAGETWO-36105

Author: Yuri Kovsher

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

@@ -25,7 +25,7 @@ abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
     protected $resultRedirectFactory;
 
     /**
-     * @var \Magento\Framework\Controller\ResultFactory;
+     * @var \Magento\Framework\Controller\ResultFactory
      */
     protected $resultFactory;