Merge branch '11.7' into 11.8

GrahamCampbell · GrahamCampbell · commit eec7d73bb20c · 2022-02-12T22:20:33.000Z
diff --git a/composer.json b/composer.json
@@ -57,6 +57,9 @@
         }
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        }
     }
 }
diff --git a/src/HttpClient/Util/JsonArray.php b/src/HttpClient/Util/JsonArray.php
@@ -39,7 +39,7 @@ public static function decode(string $json): array
             throw new RuntimeException(\sprintf('json_decode error: %s', \json_last_error_msg()));
         }
 
-        if (null === $data || !\is_array($data)) {
+        if (!\is_array($data)) {
             throw new RuntimeException(\sprintf('json_decode error: Expected JSON of type array, %s given.', \get_debug_type($data)));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`"config": {`
`60`		`- "preferred-install": "dist"`
	`60`	`+ "preferred-install": "dist",`
	`61`	`+ "allow-plugins": {`
	`62`	`+ "bamarni/composer-bin-plugin": true`
	`63`	`+ }`
`61`	`64`	`}`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function decode(string $json): array`
`39`	`39`	`throw new RuntimeException(\sprintf('json_decode error: %s', \json_last_error_msg()));`
`40`	`40`	`}`
`41`	`41`
`42`		`- if (null === $data \|\| !\is_array($data)) {`
	`42`	`+ if (!\is_array($data)) {`
`43`	`43`	`throw new RuntimeException(\sprintf('json_decode error: Expected JSON of type array, %s given.', \get_debug_type($data)));`
`44`	`44`	`}`
`45`	`45`