Merge branch 'hotfix/103'

Close #103

Author: weierophinney

CHANGELOG.md

@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
   `withHeader()` implementation to ensure that if the header existed previously
   but using a different casing strategy, the previous version will be removed
   in the cloned instance.
+- [#103](https://github.com/zendframework/zend-diactoros/pull/103) fixes the
+  constructor of `Response` to ensure that null status codes are not possible.
 
 ## 1.2.0 - 2015-11-24
 

src/Response.php

@@ -102,7 +102,7 @@ class Response implements ResponseInterface
     /**
      * @var int
      */
-    private $statusCode = 200;
+    private $statusCode;
 
     /**
      * @param string|resource|StreamInterface $body Stream identifier and/or actual stream resource
@@ -120,12 +120,9 @@ public function __construct($body = 'php://memory', $status = 200, array $header
             );
         }
 
-        if (null !== $status) {
-            $this->validateStatus($status);
-        }
+        $this->setStatusCode($status);
 
-        $this->stream     = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
-        $this->statusCode = $status ? (int) $status : 200;
+        $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
 
         list($this->headerNames, $headers) = $this->filterHeaders($headers);
         $this->assertHeaders($headers);
@@ -159,9 +156,8 @@ public function getReasonPhrase()
      */
     public function withStatus($code, $reasonPhrase = '')
     {
-        $this->validateStatus($code);
         $new = clone $this;
-        $new->statusCode   = (int) $code;
+        $new->setStatusCode($code);
         $new->reasonPhrase = $reasonPhrase;
         return $new;
     }
@@ -172,7 +168,7 @@ public function withStatus($code, $reasonPhrase = '')
      * @param int|string $code
      * @throws InvalidArgumentException on an invalid status code.
      */
-    private function validateStatus($code)
+    private function setStatusCode($code)
     {
         if (! is_numeric($code)
             || is_float($code)
@@ -184,6 +180,7 @@ private function validateStatus($code)
                 (is_scalar($code) ? $code : gettype($code))
             ));
         }
+        $this->statusCode = $code;
     }
 
     /**

test/ResponseTest.php

@@ -151,10 +151,17 @@ public function testConstructorIgonoresInvalidHeaders()
             'x-valid-string' => [ 'VALID' ],
             'x-valid-array' => [ 'VALID' ],
         ];
-        $response = new Response('php://memory', null, $headers);
+        $response = new Response('php://memory', 200, $headers);
         $this->assertEquals($expected, $response->getHeaders());
     }
 
+    public function testInvalidStatusCodeInConstructor()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        new Response('php://memory', null);
+    }
+
     public function testReasonPhraseCanBeEmpty()
     {
         $response = $this->response->withStatus(599);