Merge pull request #276 from andrzejd-pl/dev

Add new Exception for JSON errors
nategood · Jan 25, 2020 · cd9b569 · cd9b569
2 parents c1cd4d4 + 9ae25f3
commit cd9b569
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/Httpful/Exception/JsonParseException.php b/src/Httpful/Exception/JsonParseException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Httpful\Exception;
+
+class JsonParseException extends \Exception
+{
+}
diff --git a/src/Httpful/Handlers/JsonHandler.php b/src/Httpful/Handlers/JsonHandler.php
@@ -6,6 +6,8 @@
 
 namespace Httpful\Handlers;
 
+use Httpful\Exception\JsonParseException;
+
 class JsonHandler extends MimeHandlerAdapter
 {
  private $decode_as_array = false;
@@ -27,7 +29,7 @@ public function parse($body)
  return null;
  $parsed = json_decode($body, $this->decode_as_array);
  if (is_null($parsed) && 'null' !== strtolower($body))
- throw new \Exception("Unable to parse response as JSON");
+ throw new JsonParseException('Unable to parse response as JSON: ' . json_last_error_msg());
  return $parsed;
  }
 

diff --git a/tests/Httpful/HttpfulTest.php b/tests/Httpful/HttpfulTest.php
@@ -570,8 +570,8 @@ public function testParseJSON()
 
  try {
  $result = $handler->parse('invalid{json');
- } catch(\Exception $e) {
- $this->assertEquals('Unable to parse response as JSON', $e->getMessage());
+ } catch (\Httpful\Exception\JsonParseException $e) {
+ $this->assertEquals('Unable to parse response as JSON: ' . json_last_error_msg(), $e->getMessage());
  return;
  }
  $this->fail('Expected an exception to be thrown due to invalid json');