summaryrefslogtreecommitdiff
path: root/ext/json/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2012-12-111-0/+32
|\ | | | | | | | | * 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.Adam Harvey2012-12-111-0/+32
| | | | | | | | Fixes bug #63737 (json_decode does not properly decode with options parameter).
| * Revert JSON merges to 5.4Nikita Popov2012-07-0113-173/+36
| | | | | | | | | | | | | | | | This reverts the following merge commits (-m 1): 405ebfcd182a39f0960ff7d7055d49053d3e0316 d372b33c9b941be9a795bf3705bd22dc5f6092c3 36fa17a5fae84ab332366a202f0a709279a2466a
* | Fix 64bit JSON testNikita Popov2012-08-131-2/+2
| |
* | Fix test failed due to new feature introduced in 45d596eaXinchen Hui2012-07-291-3/+1
| |
* | Add optional depth parameter to json_encode #62369Florian Anderiasch2012-07-241-0/+34
|/
* Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-287-32/+32
|\ | | | | | | | | * PHP-5.3: Add json_last_error_msg() function
| * Add json_last_error_msg() functionNikita Popov2012-06-287-32/+32
| | | | | | | | | | This replaces json_last_error(true) and is consistent with other custom error handling functions.
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2710-49/+80
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Improve JSON error handling Conflicts: ext/json/tests/bug54058.phpt ext/json/tests/bug61537.phpt
| * Improve JSON error handlingNikita Popov2012-06-277-41/+59
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2311-18/+124
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Improve json_encode error handling - BFN Conflicts: ext/json/json.c
| * Improve json_encode error handlingNikita Popov2012-06-237-8/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-113-21/+37
| | | | | | | | remove a test case that's now mooted by this fix.
| * Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects ↵Ilia Alshanetsky2011-10-171-0/+13
| | | | | | | | with numeric string properties)
| * Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber)Christopher Jones2011-06-171-25/+0
| |
| * Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).Ilia Alshanetsky2011-06-011-0/+50
| |
| * Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all casesScott MacVicar2011-02-211-0/+35
| |
| * Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-201-2/+2
| | | | | | | | | | | | numeric strings to integers.
| * - Fixed testsFelipe Pena2010-04-032-8/+2
| |
* | Revert "Update test to fix breakage caused by the previous commit."Stanislav Malyshev2012-05-151-7/+3
| | | | | | | | | | This reverts commit 05c8d4766c272e101b5279f0ec432e1b16e74637. Connected to revert 7bbd5521d28ee77c5a8df80174f52dad0112e872.
* | - Fixed bug #61978 (Object recursion not detected for classes that implement ↵Felipe Pena2012-05-081-0/+47
| | | | | | | | JsonSerializable)
* | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards ↵Stanislav Malyshev2012-05-013-37/+21
| | | | | | | | | | | | | | | | 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
* | Update test to fix breakage caused by the previous commit.Adam Harvey2012-04-111-3/+7
| |
* | Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-113-21/+37
| | | | | | | | remove a test case that's now mooted by this fix.
* | Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects ↵Ilia Alshanetsky2011-10-171-0/+13
| | | | | | | | with numeric string properties)
* | Add test for #53946 to 5.4 (missed it when committing revision 315707)Gwynne Raskind2011-08-291-0/+16
| |
* | Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).Ilia Alshanetsky2011-06-011-0/+25
| |
* | Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all casesScott MacVicar2011-02-211-0/+35
| |
* | Implement FR #44331 (Formatting option for json_encode). Bikeshedding about theAdam Harvey2010-09-161-0/+40
| | | | | | | | | | | | exact form of the JSON pretty printing and brace handling will only be accepted in the form of patches. ;)
* | Implemented FR #49366 (Make slash escaping optional in json_encode()).Adam Harvey2010-09-161-0/+12
| |
* | Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbersSara Golemon2010-05-212-2/+19
| | | | | | | | | | as strings rather than casting to double and loosing precision.
* | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-202-1/+27
| | | | | | | | | | | | numeric strings to integers.
* | Rename JSON_Serializable to JsonSerializable per ML discussionSara Golemon2010-05-121-1/+1
| |
* | Add JSON_Serializable interfaceSara Golemon2010-05-051-0/+80
| | | | | | | | | | | | | | | | Objects implementing JSON_Serializable will have their ->jsonSerialize() method called Similar to serialize() and __sleep()
* | - Fixed testsFelipe Pena2010-04-032-8/+2
|/
* Fix broken json tests in all branchesRasmus Lerdorf2009-08-031-16/+8
|
* fix tests corrupted by svn's eol-style=nativeAlexey Zakhlestin2009-07-152-32/+16
|
* New json extension tests. Tested on Windows, Linux and Linux 64 bit.andy wharmby2009-06-145-0/+450
|
* MFH Missing skip in testsScott MacVicar2009-03-171-0/+2
|
* MFH Add PHP_JSON_FORCE_OBJECT for forcing an object output of an arrayScott MacVicar2009-03-171-0/+10
|
* MFH Fix bug #47644 - Valid integers are truncated with json_decode()Scott MacVicar2009-03-171-0/+43
|
* Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64andy wharmby2009-01-232-10/+16
|
* Fix test again...Scott MacVicar2009-01-081-2/+2
|
* Fix broken testScott MacVicar2009-01-081-1/+4
|
* MFH Fix bug #46944 - UTF-8 characters outside the BMP aren't encoded correctly.Scott MacVicar2009-01-021-0/+32
|
* MFH Add json_last_error() for getting a bit of information about what failed ↵Scott MacVicar2008-12-191-0/+36
| | | | | | | during a decode, also fixes a segfault when we have [1} [DOC]
* MFH Test for bug #45791Scott MacVicar2008-12-171-0/+13
|
* MFH Fix bug #45989 - json_decode() doesn't return NULL on certain invalid ↵Scott MacVicar2008-12-122-10/+9
| | | | strings
* - Fixed testsFelipe Pena2008-11-191-0/+2
|
* - New testFelipe Pena2008-10-021-0/+23
|
View Lorry Controller Status