Merge remote-tracking branch 'github-magento2ce/MAGETWO-91768' into E…

…PAM-PR-12

app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php

@@ -1,16 +1,21 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Newsletter\Controller\Subscriber;
 
-class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+/**
+ * Controller for unsubscribing customers.
+ */
+class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {
     /**
-     * Unsubscribe newsletter
-     * @return void
+     * Unsubscribe newsletter.
+     *
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -27,6 +32,9 @@ public function execute()
                 $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        /** @var \Magento\Backend\Model\View\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_redirect->getRedirectUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 }