Skip to content

Commit eec7d73

Browse files
Merge branch '11.7' into 11.8
2 parents 238fcc3 + 0bb38c1 commit eec7d73

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
}
5858
},
5959
"config": {
60-
"preferred-install": "dist"
60+
"preferred-install": "dist",
61+
"allow-plugins": {
62+
"bamarni/composer-bin-plugin": true
63+
}
6164
}
6265
}

src/HttpClient/Util/JsonArray.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function decode(string $json): array
3939
throw new RuntimeException(\sprintf('json_decode error: %s', \json_last_error_msg()));
4040
}
4141

42-
if (null === $data || !\is_array($data)) {
42+
if (!\is_array($data)) {
4343
throw new RuntimeException(\sprintf('json_decode error: Expected JSON of type array, %s given.', \get_debug_type($data)));
4444
}
4545

0 commit comments

Comments
 (0)