Adjust to new json_decode behaviour in php > 7.0

weew · May 24, 2017 · 7de1863 · 7de1863
1 parent ae3fadc
commit 7de1863
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Weew/JsonEncoder/JsonEncoder.php b/src/Weew/JsonEncoder/JsonEncoder.php
@@ -49,6 +49,10 @@ public function encode($data, $options = 0) {
      * @throws JsonDecodeException
      */
     function decode($json, $assoc = true, $depth = 512, $options = 0) {
+        if (array_contains(['', null], $json)) {
+            return null;
+        }
+
         $data = @json_decode($json, $assoc, $depth, $options);
 
         if ($data === null && json_last_error() !== JSON_ERROR_NONE) {