Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 42a07a917c4d · 2020-05-30T22:06:45.000+02:00
* 3.4:
  Various cleanups
diff --git a/Data/Bundle/Reader/JsonBundleReader.php b/Data/Bundle/Reader/JsonBundleReader.php
@@ -46,7 +46,7 @@ public function read($path, $locale)
         $data = json_decode(file_get_contents($fileName), true);
 
         if (null === $data) {
-            throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: '.json_last_error_msg(), $fileName));
+            throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());
         }
 
         return $data;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function read($path, $locale)`
`46`	`46`	`$data = json_decode(file_get_contents($fileName), true);`
`47`	`47`
`48`	`48`	`if (null === $data) {`
`49`		`- throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: '.json_last_error_msg(), $fileName));`
	`49`	`+ throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`return $data;`