Handle false and empty decoded json values as valid

main
Jordi Boggiano 13 years ago
parent 18e28a2a9f
commit 9210500714

@ -89,8 +89,9 @@ class JsonFile
*/ */
public static function parseJson($json) public static function parseJson($json)
{ {
$hash = json_decode($json, true); $data = json_decode($json, true);
if (!$hash) {
if (false === $data && 'false' !== $json) {
switch (json_last_error()) { switch (json_last_error()) {
case JSON_ERROR_NONE: case JSON_ERROR_NONE:
$msg = 'No error has occurred, is your composer.json file empty?'; $msg = 'No error has occurred, is your composer.json file empty?';
@ -114,6 +115,6 @@ class JsonFile
throw new \UnexpectedValueException('Incorrect composer.json file: '.$msg); throw new \UnexpectedValueException('Incorrect composer.json file: '.$msg);
} }
return $hash; return $data;
} }
} }

Loading…
Cancel
Save