MAGETWO-81973: Allow setting of http response status code in a Redirection magento#11405

Author: Oleksii Korshenko

lib/internal/Magento/Framework/Controller/Result/Redirect.php

@@ -9,6 +9,8 @@
 use Magento\Framework\App;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
 use Magento\Framework\Controller\AbstractResult;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\UrlInterface;
 
 /**
  * In many cases controller actions may result in a redirect
@@ -18,13 +20,14 @@
  */
 class Redirect extends AbstractResult
 {
+
     /**
-     * @var \Magento\Framework\App\Response\RedirectInterface
+     * @var RedirectInterface
      */
     protected $redirect;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlBuilder;
 
@@ -37,11 +40,11 @@ class Redirect extends AbstractResult
      * Constructor
      *
      * @param App\Response\RedirectInterface $redirect
-     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param UrlInterface $urlBuilder
      */
     public function __construct(
         App\Response\RedirectInterface $redirect,
-        \Magento\Framework\UrlInterface $urlBuilder
+        UrlInterface $urlBuilder
     ) {
         $this->redirect = $redirect;
         $this->urlBuilder = $urlBuilder;
@@ -70,6 +73,7 @@ public function setRefererOrBaseUrl()
     }
 
     /**
+     * URL Setter
      * @param string $url
      * @return $this
      */
@@ -97,7 +101,11 @@ public function setPath($path, array $params = [])
      */
     protected function render(HttpResponseInterface $response)
     {
-        $response->setRedirect($this->url);
+        if (empty($this->httpResponseCode)) {
+            $response->setRedirect($this->url);
+        } else {
+            $response->setRedirect($this->url, $this->httpResponseCode);
+        }
         return $this;
     }
 }

lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php

@@ -6,10 +6,13 @@
 
 namespace Magento\Framework\Controller\Test\Unit\Result;
 
-use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \PHPUnit\Framework\TestCase;
+use \Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \Magento\Framework\App\Response\RedirectInterface;
 use \Magento\Framework\Controller\Result\Redirect;
+use \Magento\Framework\UrlInterface;
 
-class RedirectTest extends \PHPUnit\Framework\TestCase
+class RedirectTest extends TestCase
 {
     /** @var \Magento\Framework\Controller\Result\Redirect */
     protected $redirect;
@@ -28,9 +31,9 @@ class RedirectTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->redirectInterface = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->urlInterface = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->redirectInterface = $this->createMock(RedirectInterface::class);
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
+        $this->urlInterface = $this->createMock(UrlInterface::class);
         $this->response = $this->createMock(HttpResponseInterface::class);
         $this->redirect = new Redirect($this->redirectInterface, $this->urlInterface);
     }
@@ -39,7 +42,7 @@ public function testSetRefererUrl()
     {
         $this->redirectInterface->expects($this->once())->method('getRefererUrl');
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setRefererUrl()
         );
     }
@@ -48,15 +51,15 @@ public function testSetRefererOrBaseUrl()
     {
         $this->redirectInterface->expects($this->once())->method('getRedirectUrl');
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setRefererOrBaseUrl()
         );
     }
 
     public function testSetUrl()
     {
         $url = 'http://test.com';
-        $this->assertInstanceOf(\Magento\Framework\Controller\Result\Redirect::class, $this->redirect->setUrl($url));
+        $this->assertInstanceOf(Redirect::class, $this->redirect->setUrl($url));
     }
 
     public function testSetPath()
@@ -67,17 +70,36 @@ public function testSetPath()
             $this->returnValue($params)
         );
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setPath($path, $params)
         );
     }
 
-    public function testRender()
+    public function httpRedirectResponseStatusCodes()
     {
-        $this->response->expects($this->once())->method('setRedirect');
-        $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
-            $this->redirect->renderResult($this->response)
-        );
+        return [
+            [302, null],
+            [302, 302],
+            [303, 303]
+        ];
+    }
+
+    /**
+     * @param int $expectedStatusCode
+     * @param int|null $actualStatusCode
+     * @dataProvider httpRedirectResponseStatusCodes
+     */
+    public function testRender($expectedStatusCode, $actualStatusCode)
+    {
+        $url = 'http://test.com';
+        $this->redirect->setUrl($url);
+        $this->redirect->setHttpResponseCode($actualStatusCode);
+
+        $this->response
+            ->expects($this->once())
+            ->method('setRedirect')
+            ->with($url, $expectedStatusCode);
+
+        $this->redirect->renderResult($this->response);
     }
 }