MAGETWO-36105: Refactor controllers in the Persistent module

Author: Yuri Kovsher

app/code/Magento/Persistent/Controller/Index.php

@@ -11,7 +11,6 @@
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Persistent\Helper\Session as SessionHelper;
-use Magento\Framework\Controller\Result\RedirectFactory;
 
 /**
  * Persistent front controller
@@ -44,11 +43,6 @@ class Index extends Action
      */
     protected $sessionHelper;
 
-    /**
-     * @var \Magento\Framework\Controller\Result\RedirectFactory
-     */
-    protected $resultRedirectFactory;
-
     /**
      * Whether clear checkout session when logout
      *
@@ -62,21 +56,18 @@ class Index extends Action
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Persistent\Helper\Session $sessionHelper
-     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      */
     public function __construct(
         Context $context,
         QuoteManager $quoteManager,
         CheckoutSession $checkoutSession,
         CustomerSession $customerSession,
-        SessionHelper $sessionHelper,
-        RedirectFactory $resultRedirectFactory
+        SessionHelper $sessionHelper
     ) {
         $this->quoteManager = $quoteManager;
         $this->checkoutSession = $checkoutSession;
         $this->customerSession = $customerSession;
         $this->sessionHelper = $sessionHelper;
-        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 

app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php

@@ -6,6 +6,7 @@
 namespace Magento\Persistent\Controller\Index;
 
 use Magento\Persistent\Controller\Index;
+use Magento\Framework\Controller\ResultFactory;
 
 class ExpressCheckout extends Index
 {
@@ -17,7 +18,7 @@ class ExpressCheckout extends Index
     public function execute()
     {
         $this->messageManager->addNotice(__('Your shopping cart has been updated with new prices.'));
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath('checkout/cart');
         return $resultRedirect;
     }

app/code/Magento/Persistent/Controller/Index/SaveMethod.php

@@ -6,6 +6,7 @@
 namespace Magento\Persistent\Controller\Index;
 
 use Magento\Persistent\Controller\Index;
+use Magento\Framework\Controller\ResultFactory;
 
 class SaveMethod extends Index
 {
@@ -24,7 +25,7 @@ public function execute()
             $this->quoteManager->setGuest();
         }
         $checkoutUrl = $this->_redirect->getRefererUrl();
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath($checkoutUrl . (strpos($checkoutUrl, '?') ? '&' : '?') . 'register');
         return $resultRedirect;
     }

app/code/Magento/Persistent/Controller/Index/UnsetCookie.php

@@ -6,6 +6,7 @@
 namespace Magento\Persistent\Controller\Index;
 
 use Magento\Persistent\Controller\Index;
+use Magento\Framework\Controller\ResultFactory;
 
 class UnsetCookie extends Index
 {
@@ -35,7 +36,7 @@ public function execute()
         if ($this->sessionHelper->isPersistent()) {
             $this->cleanup();
         }
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath('customer/account/login');
         return $resultRedirect;
     }