public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Detect and report UTF8 encoding errors in json files

pull/582/head
Jordi Boggiano 2012-04-16 10:55:00 +02:00
parent fea164be53
commit 3bdee3aabe
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Json/JsonFile.php
View File

@ -271,7 +271,7 @@ class JsonFile
public static function parseJson($json)
{
$data = json_decode($json, true);
if (null === $data && 'null' !== $json) {
if (null === $data && json_last_error()) {
self::validateSyntax($json);
}
@ -289,8 +289,11 @@ class JsonFile
{
$parser = new JsonParser();
$result = $parser->lint($json);
if (null === $result) {
if (defined('JSON_ERROR_UTF8') && json_last_error() === JSON_ERROR_UTF8) {
throw new \UnexpectedValueException('JSON file is not UTF-8 encoded');
}
return true;
}