Эх сурвалжийг харах

Merge pull request #3827 from fonsecas72/fix_test_php7

Make parseJson safer
Jordi Boggiano 10 жил өмнө
parent
commit
8956c34da6

+ 3 - 0
src/Composer/Json/JsonFile.php

@@ -253,6 +253,9 @@ class JsonFile
      */
      */
     public static function parseJson($json, $file = null)
     public static function parseJson($json, $file = null)
     {
     {
+        if (null === $json) {
+            return;
+        }
         $data = json_decode($json, true);
         $data = json_decode($json, true);
         if (null === $data && JSON_ERROR_NONE !== json_last_error()) {
         if (null === $data && JSON_ERROR_NONE !== json_last_error()) {
             self::validateSyntax($json, $file);
             self::validateSyntax($json, $file);