diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translation] fixed JSON loader on PHP 7 when file is empty

Browse Source
This commit is contained in:
Fabien Potencier 2015-05-22 14:11:18 +02:00
parent 1e0685711b
commit af36c341ac
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Translation/Loader/JsonFileLoader.php
View File

@ -35,10 +35,13 @@ class JsonFileLoader extends ArrayLoader implements LoaderInterface
throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource)); throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
} }
$messages = json_decode(file_get_contents($resource), true); $messages = array();
if ($data = file_get_contents($resource)) {
$messages = json_decode($data, true);
if (0 < $errorCode = json_last_error()) { if (0 < $errorCode = json_last_error()) {
throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode))); throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
}
} }
if (null === $messages) { if (null === $messages) {