fixes empty responses for xml parser

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

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/Httpful/Handlers/JsonHandler.php b/src/Httpful/Handlers/JsonHandler.php
@@ -15,7 +15,7 @@ class JsonHandler extends MimeHandlerAdapter
     public function parse($body)
     {
         if (empty($body))
-            return "";
+            return null;
         $parsed = json_decode($body, false);
         if (is_null($parsed))
             throw new \Exception("Unable to parse response as JSON");

diff --git a/src/Httpful/Handlers/XmlHandler.php b/src/Httpful/Handlers/XmlHandler.php
@@ -36,6 +36,8 @@ public function __construct(array $conf = array())
      */
     public function parse($body)
     {
+        if (empty($body))
+            return null;
         $parsed = simplexml_load_string($body, null, $this->libxml_opts, $this->namespace);
         if (!$parsed)
             throw new \Exception("Unable to parse response as XML");

diff --git a/tests/Httpful/HttpfulTest.php b/tests/Httpful/HttpfulTest.php
@@ -176,13 +176,6 @@ 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);
@@ -214,6 +207,17 @@ function testParsingContentTypeCharset()
         $this->assertEquals($response->charset, 'utf-8');
     }
 
+    function testEmptyResponseParse()
+    {
+        $req = Request::init()->sendsAndExpects(Mime::JSON);
+        $response = new Response("", self::SAMPLE_JSON_HEADER, $req);
+        $this->assertEquals(null, $response->body);
+
+        $reqXml = Request::init()->sendsAndExpects(Mime::XML);
+        $responseXml = new Response("", self::SAMPLE_XML_HEADER, $reqXml);
+        $this->assertEquals(null, $responseXml->body);
+    }
+
     function testNoAutoParse()
     {
         $req = Request::init()->sendsAndExpects(Mime::JSON)->withoutAutoParsing();