clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow JSON_OBJECT_AS_ARRAY option to actually have meaning

Browse Source 
Options can only be passed if $assoc is passed, but passing
assoc clobbers any attempt to pass JSON_OBJECT_AS_ARRAY as an
option.

Allow the option to occur in the options field by handling
"null" as default/use-options.
This commit is contained in:
Sara Golemon 2017-03-17 15:36:24 -07:00
parent ea36cf2b89
commit aa2282df21
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/json/json.c
View File

@ -259,13 +259,14 @@ static PHP_FUNCTION(json_decode)
char *str;
size_t str_len;
zend_bool assoc = 0; /* return JS objects as PHP objects by default */
zend_bool assoc_null = 1;
zend_long depth = PHP_JSON_PARSER_DEFAULT_DEPTH;
zend_long options = 0;
ZEND_PARSE_PARAMETERS_START(1, 4)
Z_PARAM_STRING(str, str_len)
Z_PARAM_OPTIONAL
Z_PARAM_BOOL(assoc)
Z_PARAM_BOOL_EX(assoc, assoc_null, 1, 0)
Z_PARAM_LONG(depth)
Z_PARAM_LONG(options)
ZEND_PARSE_PARAMETERS_END();
@ -288,10 +289,12 @@ static PHP_FUNCTION(json_decode)
}
/* For BC reasons, the bool $assoc overrides the long $options bit for PHP_JSON_OBJECT_AS_ARRAY */
if (assoc) {
options |= PHP_JSON_OBJECT_AS_ARRAY;
} else {
options &= ~PHP_JSON_OBJECT_AS_ARRAY;
if (!assoc_null) {
if (assoc) {
options |= PHP_JSON_OBJECT_AS_ARRAY;
} else {
options &= ~PHP_JSON_OBJECT_AS_ARRAY;
}
}
php_json_decode_ex(return_value, str, str_len, options, depth);

28
ext/json/tests/bug73991.phpt Normal file
View File

@ -0,0 +1,28 @@
--TEST--
Allow JSON_OBJECT_AS_ARRAY to have an effect
--FILE--
<?php
$json = '{"foo":"bar"}';
var_dump(json_decode($json, false));
var_dump(json_decode($json, true));
var_dump(json_decode($json, null, 512, 0));
var_dump(json_decode($json, null, 512, JSON_OBJECT_AS_ARRAY));
--EXPECTF--
object(stdClass)#%d (1) {
["foo"]=>
string(3) "bar"
}
array(1) {
["foo"]=>
string(3) "bar"
}
object(stdClass)#%d (1) {
["foo"]=>
string(3) "bar"
}
array(1) {
["foo"]=>
string(3) "bar"
}