Make JSON deserialization work in php 7.0.x

michael-grunder · michael-grunder · commit 96c571391e69 · 2019-05-12T12:19:21.000-07:00
In PHP 7.0.x the json_decode function returned void so we need to test
the error_code global to determine if deserialization failed.
diff --git a/library.c b/library.c
@@ -2291,7 +2291,13 @@ redis_unserialize(RedisSock* redis_sock, const char *val, int val_len,
 #endif
             break;
         case REDIS_SERIALIZER_JSON:
+#if PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION < 1
+            JSON_G(error_code) = PHP_JSON_ERROR_NONE;
+            php_json_decode(z_ret, (char*)val, val_len, 1, PHP_JSON_PARSER_DEFAULT_DEPTH);
+            ret = JSON_G(error_code) == PHP_JSON_ERROR_NONE;
+#else
             ret = !php_json_decode(z_ret, (char *)val, val_len, 1, PHP_JSON_PARSER_DEFAULT_DEPTH);
+#endif
             break;
         EMPTY_SWITCH_DEFAULT_CASE()
     }
