Merge pull request #8615 from cakephp/http-response-json

Since return type of json_decode() is mixed, no need to check return …
cakephp · Apr 8, 2016 · 7474676 · 7474676
2 parents d5d9a03 + 6464d3e
commit 7474676
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/Network/Http/Response.php b/src/Network/Http/Response.php
@@ -380,19 +380,14 @@ public function body($parser = null)
     /**
      * Get the response body as JSON decoded data.
      *
-     * @return null|array
+     * @return mixed
      */
     protected function _getJson()
     {
         if (!empty($this->_json)) {
             return $this->_json;
         }
-        $data = json_decode($this->_body, true);
-        if ($data) {
-            $this->_json = $data;
-            return $this->_json;
-        }
-        return null;
+        return $this->_json = json_decode($this->_body, true);
     }
 
     /**

diff --git a/tests/TestCase/Network/Http/ResponseTest.php b/tests/TestCase/Network/Http/ResponseTest.php
@@ -100,7 +100,23 @@ public function testBodyJson()
 
         $data = '';
         $response = new Response([], $data);
-        $this->assertFalse(isset($response->json));
+        $this->assertNull($response->json);
+
+        $data = json_encode([]);
+        $response = new Response([], $data);
+        $this->assertTrue(is_array($response->json));
+
+        $data = json_encode(null);
+        $response = new Response([], $data);
+        $this->assertNull($response->json);
+
+        $data = json_encode(false);
+        $response = new Response([], $data);
+        $this->assertFalse($response->json);
+
+        $data = json_encode('');
+        $response = new Response([], $data);
+        $this->assertSame('', $response->json);
     }
 
     /**