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

Manage JSON_THROW_ON_ERROR conflict #258

Closed
wants to merge 1 commit into from
Closed

Manage JSON_THROW_ON_ERROR conflict #258

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
9 changes: 9 additions & 0 deletions lib/special_cases.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
*/
function json_decode(string $json, bool $assoc = false, int $depth = 512, int $options = 0)
{
if ($options & 4194304) { // options has JSON_THROW_ON_ERROR
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ($options & 4194304) { // options has JSON_THROW_ON_ERROR
if ($options & JSON_THROW_ON_ERROR) {

try {
$data = \json_decode($json, $assoc, $depth, $options);
} catch (\Exception $e) {
throw new JsonException($e->getMessage(), (int) $e->getCode());
}
return $data;
}

$data = \json_decode($json, $assoc, $depth, $options);
if (JSON_ERROR_NONE !== json_last_error()) {
throw JsonException::createFromPhpError();
Expand Down