Skip to content

Throw exception for errors that are returned along with an "ok" http status #6

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

Open
dejan9393 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Throw exception for errors that are returned along with an "ok" http status #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions src/Rest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,26 @@ public function __construct($apiToken)
* @param string $result The API response
* @param int $httpCode The HTTP status code
*
* @throws Exception
* @throws ClickatellException
* @return array
*/
protected function handle($result, $httpCode)
{
// Check for non-OK statuses
$decoded = json_decode($result, true);

// Check for OK statuses
$codes = explode(",", static::ACCEPTED_CODES);
$ok_status = in_array($httpCode, $codes);

$is_error = isset($decoded['error']) || !$ok_status;
if ($is_error) {
// If no error key is present in the decoded JSON, return the entire body as an exception.
$error = isset($decoded['error']) ? $decoded['error'] : $result;

if (!in_array($httpCode, $codes)) {
// Decode JSON if possible, if this can't be decoded...something fatal went wrong
// and we will just return the entire body as an exception.
if ($error = json_decode($result, true)) {
$error = $error['error'];
} else {
$error = $result;
}

throw new \Clickatell\ClickatellException($error);
} else {
return json_decode($result, true);
throw new ClickatellException($error);
}

return $decoded;
}

/**
Expand Down