Merge branch 'feature/236' into develop

Close #236

Author: weierophinney

CHANGELOG.md

@@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file, in reverse
   `toArray()` and `fromArray()`, allowing de/serialization of messages from and
   to arrays.
 
+- [#236](https://github.com/zendframework/zend-diactoros/pull/236) adds two new
+  constants to the `Response` class: `MIN_STATUS_CODE_VALUE` and
+  `MAX_STATUS_CODE_VALUE`.
+
 ### Changes
 
 - [#240](https://github.com/zendframework/zend-diactoros/pull/240) changes the

src/Response.php

@@ -24,6 +24,9 @@ class Response implements ResponseInterface
 {
     use MessageTrait;
 
+    const MIN_STATUS_CODE_VALUE = 100;
+    const MAX_STATUS_CODE_VALUE = 599;
+
     /**
      * Map of standard HTTP status code/reason phrases
      *
@@ -159,21 +162,23 @@ public function withStatus($code, $reasonPhrase = '')
     }
 
     /**
-     * Validate a status code.
+     * Set a valid status code.
      *
-     * @param int|string $code
+     * @param int $code
      * @throws InvalidArgumentException on an invalid status code.
      */
     private function setStatusCode($code)
     {
         if (! is_numeric($code)
             || is_float($code)
-            || $code < 100
-            || $code >= 600
+            || $code < static::MIN_STATUS_CODE_VALUE
+            || $code > static::MAX_STATUS_CODE_VALUE
         ) {
             throw new InvalidArgumentException(sprintf(
-                'Invalid status code "%s"; must be an integer between 100 and 599, inclusive',
-                (is_scalar($code) ? $code : gettype($code))
+                'Invalid status code "%s"; must be an integer between %d and %d, inclusive',
+                (is_scalar($code) ? $code : gettype($code)),
+                static::MIN_STATUS_CODE_VALUE,
+                static::MAX_STATUS_CODE_VALUE
             ));
         }
         $this->statusCode = $code;

src/Response/Serializer.php

@@ -37,7 +37,7 @@ public static function fromString($message)
      * Parse a response from a stream.
      *
      * @param StreamInterface $stream
-     * @return ResponseInterface
+     * @return Response
      * @throws InvalidArgumentException when the stream is not readable.
      * @throws UnexpectedValueException when errors occur parsing the message.
      */

src/Stream.php

@@ -19,7 +19,7 @@
 class Stream implements StreamInterface
 {
     /**
-     * @var resource
+     * @var resource|null
      */
     protected $resource;
 

test/ResponseTest.php

@@ -40,28 +40,6 @@ public function testStatusCodeMutatorReturnsCloneWithChanges()
         $this->assertEquals(400, $response->getStatusCode());
     }
 
-    public function invalidStatusCodes()
-    {
-        return [
-            'too-low' => [99],
-            'too-high' => [600],
-            'null' => [null],
-            'bool' => [true],
-            'string' => ['foo'],
-            'array' => [[200]],
-            'object' => [(object) [200]],
-        ];
-    }
-
-    /**
-     * @dataProvider invalidStatusCodes
-     */
-    public function testCannotSetInvalidStatusCode($code)
-    {
-        $this->setExpectedException('InvalidArgumentException');
-        $response = $this->response->withStatus($code);
-    }
-
     public function testReasonPhraseDefaultsToStandards()
     {
         $response = $this->response->withStatus(422);
@@ -151,29 +129,60 @@ public function testConstructorCanAcceptAllMessageParts()
         $this->assertEquals($headers, $response->getHeaders());
     }
 
-    public function invalidStatus()
+    /**
+     * @dataProvider validStatusCodes
+     */
+    public function testCreateWithValidStatusCodes($code)
+    {
+        $response = $this->response->withStatus($code);
+
+        $this->assertEquals($code, $response->getStatusCode());
+    }
+
+    public function validStatusCodes()
     {
         return [
-            'true' => [ true ],
-            'false' => [ false ],
-            'float' => [ 100.1 ],
-            'bad-string' => [ 'Two hundred' ],
-            'array' => [ [ 200 ] ],
-            'object' => [ (object) [ 'statusCode' => 200 ] ],
-            'too-small' => [ 1 ],
-            'too-big' => [ 600 ],
+            'minimum' => [100],
+            'middle' => [300],
+            'maximum' => [599],
         ];
     }
 
     /**
-     * @dataProvider invalidStatus
+     * @dataProvider invalidStatusCodes
      */
     public function testConstructorRaisesExceptionForInvalidStatus($code)
     {
         $this->setExpectedException('InvalidArgumentException', 'Invalid status code');
+
         new Response('php://memory', $code);
     }
 
+    /**
+     * @dataProvider invalidStatusCodes
+     */
+    public function testCannotSetInvalidStatusCode($code)
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $this->response->withStatus($code);
+    }
+
+    public function invalidStatusCodes()
+    {
+        return [
+            'true' => [ true ],
+            'false' => [ false ],
+            'array' => [ [ 200 ] ],
+            'object' => [ (object) [ 'statusCode' => 200 ] ],
+            'too-low' => [99],
+            'float' => [400.5],
+            'too-high' => [600],
+            'null' => [null],
+            'string' => ['foo'],
+        ];
+    }
+
     public function invalidResponseBody()
     {
         return [