Merge branch 'hotfix/257'

Close #257
Fixes #255

Author: weierophinney

CHANGELOG.md

@@ -29,6 +29,10 @@ All notable changes to this project will be documented in this file, in reverse
   response instance do not override those set by PHP when a session is created
   and/or regenerated.
 
+- [#257](https://github.com/zendframework/zend-diactoros/pull/257) provides a
+  fix for the `PhpInputStream::read()` method to ensure string content that
+  evaluates as empty (including `0`) is still cached.
+
 ## 1.4.0 - 2017-04-06
 
 ### Added

src/PhpInputStream.php

@@ -59,7 +59,7 @@ public function isWritable()
     public function read($length)
     {
         $content = parent::read($length);
-        if ($content && ! $this->reachedEof) {
+        if (! $this->reachedEof) {
             $this->cache .= $content;
         }
 

test/PhpInputStreamTest.php

@@ -64,6 +64,17 @@ public function testGetContentsReturnsRemainingContentsOfStream()
         $this->assertEquals(substr($contents, 128), $remainder);
     }
 
+    public function testGetContentsReturnCacheWhenReachedEof()
+    {
+        $this->stream->getContents();
+        $this->assertStreamContents($this->stream->getContents());
+
+        $stream = new PhpInputStream('data://,0');
+        $stream->read(1);
+        $stream->read(1);
+        $this->assertSame('0', $stream->getContents(), 'Don\'t evaluate 0 as empty');
+    }
+
     public function testCastingToStringReturnsFullContentsRegardlesOfPriorReads()
     {
         $start = $this->stream->read(128);