Skip to content

Fix for empty encodedValue in php 7 #1

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
carlos22 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for empty encodedValue in php 7 #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e86762
fix for php7 (empty strings result in syntax error for php >= 7.0.0)
carlos22 Mar 29, 2018
d41b37d
php7 empty values fix improved and simplified
carlos22 Mar 29, 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
5 changes: 5 additions & 0 deletions library/Zend/Json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ class Zend_Json
public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
{
$encodedValue = (string) $encodedValue;
// fix for php7 (empty strings result in syntax error for php >= 7.0.0 if calling json_last_error)
if (empty($encodedValue)) {
return null;
}

if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
$decode = json_decode($encodedValue, $objectDecodeType);

Expand Down