fixes issue #30, prevents json parser from bombing out on empty bodies

nategood · May 20, 2012 · dd5b82a · dd5b82a
1 parent cc202f9
commit dd5b82a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Httpful/Handlers/JsonHandler.php b/src/Httpful/Handlers/JsonHandler.php
@@ -6,20 +6,22 @@
 
 namespace Httpful\Handlers;
 
-class JsonHandler extends MimeHandlerAdapter 
+class JsonHandler extends MimeHandlerAdapter
 {
     /**
      * @param string $body
      * @return mixed
      */
     public function parse($body)
     {
+        if (empty($body))
+            return "";
         $parsed = json_decode($body, false);
         if (is_null($parsed))
             throw new \Exception("Unable to parse response as JSON");
         return $parsed;
     }
-    
+
     /**
      * @param mixed $payload
      * @return string

diff --git a/tests/Httpful/HttpfulTest.php b/tests/Httpful/HttpfulTest.php
@@ -176,6 +176,13 @@ function testJsonResponseParse()
         $this->assertEquals(1, $response->body->array[0]);
     }
 
+    function testEmptyJsonResponseParse()
+    {
+        $req = Request::init()->sendsAndExpects(Mime::JSON);
+        $response = new Response("", self::SAMPLE_JSON_HEADER, $req);
+        $this->assertEquals("", $response->body);
+    }
+
     function testXMLResponseParse()
     {
         $req = Request::init()->sendsAndExpects(Mime::XML);