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

Make check more explicit

pull/582/head
Jordi Boggiano 2012-04-16 11:13:34 +02:00
parent 3bdee3aabe
commit 69864aeb13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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