Fixing return of values seen as empty in Response.php

cakephp · Oct 18, 2016 · 0c0f32f · 0c0f32f
1 parent 605f350
commit 0c0f32f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Network/Response.php b/src/Network/Response.php
@@ -438,7 +438,7 @@ public function __construct(array $options = [])
         }
         if (isset($options['stream'])) {
             if (!$options['stream'] instanceof StreamInterface) {
-                throw new InvalidArgumentException('Stream option must be an object implement StreamInterface');
+                throw new InvalidArgumentException('Stream option must be an object that implements StreamInterface');
             }
             $this->stream = $options['stream'];
         } else {
@@ -741,7 +741,7 @@ public function body($content = null)
         if ($content === null) {
             $this->stream->rewind();
             $result = $this->stream->getContents();
-            if (empty($result)) {
+            if (empty($result) && strlen($result) === 0) {
                 return null;
             }
 
@@ -758,7 +758,7 @@ public function body($content = null)
         $this->stream->rewind();
         $result = $this->stream->getContents();
 
-        if (empty($result)) {
+        if (empty($result) && strlen($result) === 0) {
             return null;
         }
 
@@ -1108,6 +1108,7 @@ public function sharable($public = null, $time = null)
 
     /**
      * Sets the Cache-Control s-maxage directive.
+     *
      * The max-age is the number of seconds after which the response should no longer be considered
      * a good candidate to be fetched from a shared cache (like in a proxy server).
      * If called with no parameters, this function will return the current max-age value if any

diff --git a/tests/TestCase/Network/ResponseTest.php b/tests/TestCase/Network/ResponseTest.php
@@ -99,6 +99,18 @@ public function testBody()
         $response->body('Response body');
         $this->assertEquals('Response body', $response->body());
         $this->assertEquals('Changed Body', $response->body('Changed Body'));
+
+        $response = new Response();
+        $response->body(0);
+        $this->assertEquals(0, $response->body());
+
+        $response = new Response();
+        $response->body('0');
+        $this->assertEquals('0', $response->body());
+
+        $response = new Response();
+        $response->body(null);
+        $this->assertEquals(null, $response->body());
     }
 
     /**