MAGETWO-33074: Upgrade response class.

Author: Sergey Semenov

dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php

@@ -168,12 +168,14 @@ public function testExecute()
         $this->request->expects($this->once())
             ->method('isPost')
             ->willReturn(false);
-        $this->resultRaw->expects($this->exactly(2))
+        $this->resultRaw->expects($this->once())
+            ->method('setStatusHeader')
+            ->with(403, '1.1', 'Session Expired')
+            ->willReturn($this->resultRaw);
+        $this->resultRaw->expects($this->once())
             ->method('setHeader')
-            ->willReturnMap([
-                ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
-                ['Login-Required', 'true', false, $this->resultRaw]
-            ]);
+            ->with('Login-Required', 'true', false)
+            ->willReturn($this->resultRaw);
         $this->assertSame($this->resultRaw, $this->controller->execute());
     }
 

dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php

@@ -169,12 +169,14 @@ public function testExecute()
         $this->request->expects($this->once())
             ->method('isPost')
             ->willReturn(false);
-        $this->resultRaw->expects($this->exactly(2))
+        $this->resultRaw->expects($this->once())
+            ->method('setStatusHeader')
+            ->with(403, '1.1', 'Session Expired')
+            ->willReturn($this->resultRaw);
+        $this->resultRaw->expects($this->once())
             ->method('setHeader')
-            ->willReturnMap([
-                ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
-                ['Login-Required', 'true', false, $this->resultRaw]
-            ]);
+            ->with('Login-Required', 'true', false)
+            ->willReturn($this->resultRaw);
         $this->assertSame($this->resultRaw, $this->controller->execute());
     }
 

dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php

@@ -90,11 +90,8 @@ public function testExecuteResultPage()
         $this->resultPageMock->expects(
             $this->at(0)
         )->method(
-            'setHeader'
-        )->with(
-            'HTTP/1.1',
-            '404 Not Found'
-        )->will(
+            'setStatusHeader'
+        )->with(404, '1.1', 'Not Found')->will(
             $this->returnSelf()
         );
         $this->resultPageMock->expects(

lib/internal/Magento/Framework/Controller/AbstractResult.php

@@ -20,6 +20,21 @@ abstract class AbstractResult implements ResultInterface
      */
     protected $headers = [];
 
+    /**
+     * @var string
+     */
+    protected $statusHeaderCode;
+
+    /**
+     * @var string
+     */
+    protected $statusHeaderVersion;
+
+    /**
+     * @var string
+     */
+    protected $statusHeaderPhrase;
+
     /**
      * Set response code to result
      *
@@ -53,6 +68,20 @@ public function setHeader($name, $value, $replace = false)
         return $this;
     }
 
+    /**
+     * @param int|string $httpCode
+     * @param null|int|string $version
+     * @param null|string $phrase
+     * @return $this
+     */
+    public function setStatusHeader($httpCode, $version = null, $phrase = null)
+    {
+        $this->statusHeaderCode = $httpCode;
+        $this->statusHeaderVersion = $version;
+        $this->statusHeaderPhrase = $phrase;
+        return $this;
+    }
+
     /**
      * @param ResponseInterface $response
      * @return $this
@@ -62,7 +91,13 @@ protected function applyHttpHeaders(ResponseInterface $response)
         if (!empty($this->httpResponseCode)) {
             $response->setHttpResponseCode($this->httpResponseCode);
         }
-
+        if ($this->statusHeaderCode) {
+            $response->setStatusHeader(
+                $this->statusHeaderCode,
+                $this->statusHeaderVersion,
+                $this->statusHeaderPhrase
+            );
+        }
         if (!empty($this->headers)) {
             foreach ($this->headers as $headerData) {
                 $response->setHeader($headerData['name'], $headerData['value'], $headerData['replace']);