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

fabpot · fabpot · commit d030b3d8d969 · 2015-05-22T16:37:51.000+02:00
diff --git a/Loader/JsonFileLoader.php b/Loader/JsonFileLoader.php
@@ -35,10 +35,13 @@ public function load($resource, $locale, $domain = 'messages')
             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()) {
-            throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+            if (0 < $errorCode = json_last_error()) {
+                throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+            }
         }
 
         if (null === $messages) {

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,13 @@ public function load($resource, $locale, $domain = 'messages')`
`35`	`35`	`throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));`
`36`	`36`	`}`
`37`	`37`
`38`		`- $messages = json_decode(file_get_contents($resource), true);`
	`38`	`+ $messages = array();`
	`39`	`+ if ($data = file_get_contents($resource)) {`
	`40`	`+ $messages = json_decode($data, true);`
`39`	`41`
`40`		`- if (0 < $errorCode = json_last_error()) {`
`41`		`- throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));`
	`42`	`+ if (0 < $errorCode = json_last_error()) {`
	`43`	`+ throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));`
	`44`	`+ }`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`if (null === $messages) {`