Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

show more ...

Make all code paths in json_determine_array_type() return constants.

This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.

Fix #66021 (Blank line inside empty array/object)

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket

Fix #66021 (Blank line inside empty array/object)

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).

show more ...

Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

HASH_KEY_NON_EXISTANT fix

Happy New Year

Happy New Year

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

Fixes bug #63737 (json_decode does not properly decode with options parameter).

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Related bug #63588 fix length computation + optimize for speed

Related bug #63588 fix length computation + optimize for speed

Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also

Related bug #63588 fix length computation + optimize for speed

Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.

show more ...

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also help

Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.

show more ...

Fix test failed due to new feature introduced in 45d596ea

Add optional depth parameter to json_encode #62369

Revert JSON merges to 5.4

This reverts the following merge commits (-m 1):

405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab3

Revert JSON merges to 5.4

This reverts the following merge commits (-m 1):

405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a

show more ...

fix bug #61359: json_encode() calls too many reallocs

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Add json_last_error_msg() function

Add json_last_error_msg() function

This replaces json_last_error(true) and is consistent with other custom
error handling functions.

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Improve JSON error handling

Conflicts:
ext/json/tests/bug54058.phpt
ext/json/tests/bug61537.phpt

Improve JSON error handling

json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.

As it is hard to debug the error from just an erro

Improve JSON error handling

json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.

As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.

show more ...

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Improve json_encode error handling
- BFN

Conflicts:
ext/json/json.c

Improve json_encode error handling

json_encode() now returns bool(false) for all possible errors, throws the
respective warning and also sets the respective json_last_error() error
c

Improve json_encode error handling

json_encode() now returns bool(false) for all possible errors, throws the
respective warning and also sets the respective json_last_error() error
code. Three new error codes have been added:

* JSON_ERROR_RECURSION
* JSON_ERROR_INF_OR_NAN
* JSON_ERROR_UNSUPPORTED_TYPE

To get a partial JSON output instead of bool(false) the option
JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid
segments will be replaced either by null (for recursion, unsupported type
and invalid JSON) or 0 (for Inf and NaN).

The warning for invalid UTF-8 stays intact and is thrown also with
display_errors = On. If this behavior is undesired this can be remedied
later.

show more ...

- Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)

Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"

This reverts commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b.
The fix is not correct, not fixed aft

Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"

This reverts commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch

show more ...