Merge pull request #3827 from fonsecas72/fix_test_php7

Make parseJson safer
main
Jordi Boggiano 9 years ago
commit 8956c34da6

@ -253,6 +253,9 @@ class JsonFile
*/
public static function parseJson($json, $file = null)
{
if (null === $json) {
return;
}
$data = json_decode($json, true);
if (null === $data && JSON_ERROR_NONE !== json_last_error()) {
self::validateSyntax($json, $file);

Loading…
Cancel
Save