Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new Exception #276

Merged
merged 3 commits into from
Jan 25, 2020
+12 −3
Merged

Add new Exception #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43668cf
add JsonParseException
andrzejd-pl Jul 30, 2018
5d2508b
replace Exception to JsonParseException
andrzejd-pl Jul 30, 2018
9ae25f3
change unit test (testParseJSON)
andrzejd-pl Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Httpful/Exception/JsonParseException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Httpful\Exception;

class JsonParseException extends \Exception
{
}
4 changes: 3 additions & 1 deletion src/Httpful/Handlers/JsonHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

namespace Httpful\Handlers;

use Httpful\Exception\JsonParseException;

class JsonHandler extends MimeHandlerAdapter
{
private $decode_as_array = false;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/Httpful/HttpfulTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down