MAGETWO-36105: Refactor controllers in the Persistent module

Author: Yuri Kovsher

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

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

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

@@ -25,8 +25,9 @@ public function execute()
             $this->quoteManager->setGuest();
         }
         $checkoutUrl = $this->_redirect->getRefererUrl();
+        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        $resultRedirect->setPath($checkoutUrl . (strpos($checkoutUrl, '?') ? '&' : '?') . 'register');
+        $resultRedirect->setUrl($checkoutUrl . (strpos($checkoutUrl, '?') ? '&' : '?') . 'register');
         return $resultRedirect;
     }
 }

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

@@ -10,6 +10,22 @@
 
 class UnsetCookie extends Index
 {
+    /**
+     * Unset persistent cookie action
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function execute()
+    {
+        if ($this->sessionHelper->isPersistent()) {
+            $this->cleanup();
+        }
+        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $resultRedirect->setPath('customer/account/login');
+        return $resultRedirect;
+    }
+
     /**
      * Revert all persistent data
      *
@@ -25,19 +41,4 @@ protected function cleanup()
         $this->sessionHelper->getSession()->removePersistentCookie();
         return $this;
     }
-
-    /**
-     * Unset persistent cookie action
-     *
-     * @return \Magento\Framework\Controller\Result\Redirect
-     */
-    public function execute()
-    {
-        if ($this->sessionHelper->isPersistent()) {
-            $this->cleanup();
-        }
-        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        $resultRedirect->setPath('customer/account/login');
-        return $resultRedirect;
-    }
 }