Validate Response body type

Author: clue

src/Message/Response.php

@@ -34,15 +34,25 @@
  */
 class Response extends Psr7Response
 {
+    /**
+     * @param int                                            $status  HTTP status code (e.g. 200/404)
+     * @param array<string,string|string[]>                  $headers additional response headers
+     * @param string|ReadableStreamInterface|StreamInterface $body    response body
+     * @param string                                         $version HTTP protocol version (e.g. 1.1/1.0)
+     * @param ?string                                        $reason  custom HTTP response phrase
+     * @throws \InvalidArgumentException for an invalid body
+     */
     public function __construct(
         $status = 200,
         array $headers = array(),
-        $body = null,
+        $body = '',
         $version = '1.1',
         $reason = null
     ) {
-        if ($body instanceof ReadableStreamInterface) {
+        if ($body instanceof ReadableStreamInterface && !$body instanceof StreamInterface) {
             $body = new HttpBodyStream($body, null);
+        } elseif (!\is_string($body) && !$body instanceof StreamInterface) {
+            throw new \InvalidArgumentException('Invalid response body given');
         }
 
         parent::__construct(

tests/Message/ResponseTest.php

@@ -2,21 +2,51 @@
 
 namespace React\Tests\Http\Message;
 
+use React\Http\Io\HttpBodyStream;
 use React\Http\Message\Response;
 use React\Stream\ThroughStream;
 use React\Tests\Http\TestCase;
 
 class ResponseTest extends TestCase
 {
-    public function testResponseBodyWillBeHttpBodyStream()
-    {
-        $response = new Response(200, array(), new ThroughStream());
-        $this->assertInstanceOf('React\Http\Io\HttpBodyStream', $response->getBody());
-    }
 
     public function testStringBodyWillBePsr7Stream()
     {
         $response = new Response(200, array(), 'hello');
         $this->assertInstanceOf('RingCentral\Psr7\Stream', $response->getBody());
     }
+
+    public function testConstructWithStreamingBodyWillReturnReadableBodyStream()
+    {
+        $response = new Response(200, array(), new ThroughStream());
+
+        $body = $response->getBody();
+        $this->assertInstanceOf('Psr\Http\Message\StreamInterface', $body);
+        $this->assertInstanceof('React\Stream\ReadableStreamInterface', $body);
+        $this->assertInstanceOf('React\Http\Io\HttpBodyStream', $body);
+        $this->assertNull($body->getSize());
+    }
+
+    public function testConstructWithHttpBodyStreamReturnsBodyAsIs()
+    {
+        $response = new Response(
+            200,
+            array(),
+            $body = new HttpBodyStream(new ThroughStream(), 100)
+        );
+
+        $this->assertSame($body, $response->getBody());
+    }
+
+    public function testFloatBodyWillThrow()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        new Response(200, array(), 1.0);
+    }
+
+    public function testResourceBodyWillThrow()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        new Response(200, array(), tmpfile());
+    }
 }