]> granicus.if.org Git - php/commit
Allow JSON_OBJECT_AS_ARRAY option to actually have meaning
authorSara Golemon <pollita@php.net>
Fri, 17 Mar 2017 22:36:24 +0000 (15:36 -0700)
committerSara Golemon <pollita@php.net>
Fri, 17 Mar 2017 22:36:24 +0000 (15:36 -0700)
commitaa2282df21b32f9a2a1e86b580cb4fca5ff2c3f5
treef7feb067887b4155814d841d9a216321b7e58167
parentea36cf2b89dc7c0ffedc56dfeff865ed14273063
Allow JSON_OBJECT_AS_ARRAY option to actually have meaning

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.
ext/json/json.c
ext/json/tests/bug73991.phpt [new file with mode: 0644]