Merge pull request #70 from php-http/empty_stream_body

Add check for empty string to stream factories
php-http · Jan 8, 2017 · 016359f · 016359f
2 parents f28c46e + e9c1041
commit 016359f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 ## Unreleased
 
+## Added
+
+- Check for empty string in Stream factories
+
 ## Fixed
 
  - FilteredStream::getSize returns null because the contents size is unknown.

diff --git a/src/StreamFactory/DiactorosStreamFactory.php b/src/StreamFactory/DiactorosStreamFactory.php
@@ -24,10 +24,12 @@ public function createStream($body = null)
             } else {
                 $stream = new Stream('php://memory', 'rw');
 
-                if (null !== $body) {
-                    $stream->write((string) $body);
+                if (null === $body || '' === $body) {
+                    return $stream;
                 }
 
+                $stream->write((string) $body);
+
                 $body = $stream;
             }
         }

diff --git a/src/StreamFactory/SlimStreamFactory.php b/src/StreamFactory/SlimStreamFactory.php
@@ -28,9 +28,11 @@ public function createStream($body = null)
             $resource = fopen('php://memory', 'r+');
             $stream = new Stream($resource);
 
-            if (null !== $body) {
-                $stream->write((string) $body);
+            if (null === $body || '' === $body) {
+                return $stream;
             }
+
+            $stream->write((string) $body);
         }
 
         $stream->rewind();