Skip to content

JSON exceptions #16

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

Merged
chrisminett merged 2 commits into from
Feb 14, 2025
Merged

JSON exceptions #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc8d31
Add exact JSON method return type
chrisminett Feb 14, 2025
d23d444
Use JSON exceptions
chrisminett Feb 14, 2025
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
49 changes: 5 additions & 44 deletions src/JsonTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,12 @@
*/
trait JsonTrait
{
/**
* @return mixed
*/
private static function decodeJson(string $json)
private static function decodeJson(string $json): string|int|bool|\stdClass
{
$result = json_decode($json, false);
$errorCode = json_last_error();

if ($errorCode === JSON_ERROR_NONE) {
return $result;
}

// Generate error message
switch ($errorCode) {
case JSON_ERROR_DEPTH:
$error = 'Maximum stack depth exceeded';
break;
case JSON_ERROR_STATE_MISMATCH:
$error = 'Invalid or malformed JSON';
break;
case JSON_ERROR_CTRL_CHAR:
$error = 'Unexpected control character found';
break;
case JSON_ERROR_SYNTAX:
$error = 'Syntax error';
break;
case JSON_ERROR_UTF8:
$error = 'Malformed UTF-8 characters, possibly incorrectly encoded';
break;
case JSON_ERROR_UTF16:
$error = 'Malformed UTF-16 characters, possibly incorrectly encoded';
break;
default:
$error = 'Unknown error';
// Find the const name
$constants = get_defined_constants(true);
foreach ($constants['json'] as $name => $value) {
if (!strncmp($name, 'JSON_ERROR_', 11) && $value === $errorCode) {
$error = $name;
break;
}
}
break;
try {
return json_decode($json, false, flags: JSON_THROW_ON_ERROR);
} catch (\JsonException $e) {
throw new Exception\UnexpectedValueException("Problem decoding JSON : {$e->getMessage()} : '{$json}'");
}

throw new Exception\UnexpectedValueException("Problem decoding JSON : {$error} : '{$json}'");
}
}
4 changes: 1 addition & 3 deletions src/Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ public function __construct(

/**
* Call service method
*
* @return mixed
*/
public function __call(string $name, array $params)
public function __call(string $name, array $params): string|int|bool|\stdClass
{
$data = [
'method' => $name,
Expand Down