Merge branch 'hotfix/115' into develop

Forward port #115

CHANGELOG.md

@@ -39,6 +39,12 @@ All notable changes to this project will be documented in this file, in reverse
 - [#113](https://github.com/zendframework/zend-diactoros/pull/113) fixes an
   issue in the response serializer, ensuring that the status code in the
   deserialized response is an integer.
+- [#115](https://github.com/zendframework/zend-diactoros/pull/115) fixes an
+  issue in the various text-basd response types (`TextResponse`, `HtmlResponse`,
+  and `JsonResponse`); due to the fact that the constructor was not
+  rewinding the message body stream, `getContents()` was thus returning `null`,
+  as the pointer was at the end of the stream. The constructor now rewinds the
+  stream after populating it in the constructor.
 
 ## 1.3.0 - 2015-12-15
 

src/Response/HtmlResponse.php

@@ -68,6 +68,7 @@ private function createBody($html)
 
         $body = new Stream('php://temp', 'wb+');
         $body->write($html);
+        $body->rewind();
         return $body;
     }
 }

src/Response/JsonResponse.php

@@ -61,6 +61,7 @@ public function __construct(
     ) {
         $body = new Stream('php://temp', 'wb+');
         $body->write($this->jsonEncode($data, $encodingOptions));
+        $body->rewind();
 
         $headers = $this->injectContentType('application/json', $headers);
 

src/Response/TextResponse.php

@@ -68,6 +68,7 @@ private function createBody($text)
 
         $body = new Stream('php://temp', 'wb+');
         $body->write($text);
+        $body->rewind();
         return $body;
     }
 }

test/Response/HtmlResponseTest.php

@@ -79,4 +79,13 @@ public function testRaisesExceptionforNonStringNonStreamBodyContent($body)
     {
         $response = new HtmlResponse($body);
     }
+
+    public function testConstructorRewindsBodyStream()
+    {
+        $html = '<p>test data</p>';
+        $response = new HtmlResponse($html);
+
+        $actual = $response->getBody()->getContents();
+        $this->assertEquals($html, $actual);
+    }
 }

test/Response/JsonResponseTest.php

@@ -126,4 +126,13 @@ public function testUsesSaneDefaultJsonEncodingFlags($value, $key)
             sprintf('Did not encode %s properly; expected (%s), received (%s)', $key, $expected, $contents)
         );
     }
+
+    public function testConstructorRewindsBodyStream()
+    {
+        $json = ['test' => 'data'];
+        $response = new JsonResponse($json);
+
+        $actual = json_decode($response->getBody()->getContents(), true);
+        $this->assertEquals($json, $actual);
+    }
 }

test/Response/TextResponseTest.php

@@ -79,4 +79,16 @@ public function testRaisesExceptionforNonStringNonStreamBodyContent($body)
     {
         new TextResponse($body);
     }
+
+    /**
+     * @group 115
+     */
+    public function testConstructorRewindsBodyStream()
+    {
+        $text = 'test data';
+        $response = new TextResponse($text);
+
+        $actual = $response->getBody()->getContents();
+        $this->assertEquals($text, $actual);
+    }
 }