From 359df4dea8aa87f7b0c86471c312f60697e71b75 Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 10 May 2015 18:08:16 +0100 Subject: Tidy up and regenerate json parser with latest bison version --- ext/json/json_parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/json/json_parser.y') diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index 4d3dcfe706..044b82eb51 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -187,11 +187,11 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object) void php_json_parser_object_update(php_json_parser *parser, zval *object, zend_string *key, zval *zvalue) { - if (Z_TYPE_P(object) == IS_ARRAY/*parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY*/) { + /* if JSON_OBJECT_AS_ARRAY is set */ + if (Z_TYPE_P(object) == IS_ARRAY) { zend_symtable_update(Z_ARRVAL_P(object), key, zvalue); } else { zval zkey; - /* ZEND_ASSERT(Z_TYPE_P(object) == IS_OBJECT); */ if (key->len == 0) { zend_string_release(key); key = zend_string_init("_empty_", sizeof("_empty_") - 1, 0); -- cgit v1.2.1