summaryrefslogtreecommitdiff
path: root/ext/json/tests
Commit message (Expand)AuthorAgeFilesLines
* Fix bug #68817: Null pointer deferenceStanislav Malyshev2015-01-141-0/+17
* Port JSONNikita Popov2014-05-051-1/+1
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-0/+20
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-0/+20
| |\
| | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-131-0/+20
| | |\
| | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-021-0/+20
* | | | Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...Andrea Faulds2013-11-111-0/+69
|/ / /
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-101-0/+117
|\ \ \ | |/ /
| * | Better test: Check combined leading/trailingAndrea Faulds2013-10-151-0/+66
| * | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...Andrea Faulds2013-09-171-0/+51
| |/
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2012-12-111-0/+32
|\ \ | |/
| * Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.Adam Harvey2012-12-111-0/+32
| * Revert JSON merges to 5.4Nikita Popov2012-07-0113-173/+36
* | 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
|\
| * Add json_last_error_msg() functionNikita Popov2012-06-287-32/+32
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2710-49/+80
|\ \ | |/
| * Improve JSON error handlingNikita Popov2012-06-277-41/+59
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2311-18/+124
|\ \ | |/
| * Improve json_encode error handlingNikita Popov2012-06-237-8/+95
| * Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-113-21/+37
| * Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with...Ilia Alshanetsky2011-10-171-0/+13
| * 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
| * - Fixed testsFelipe Pena2010-04-032-8/+2
* | Revert "Update test to fix breakage caused by the previous commit."Stanislav Malyshev2012-05-151-7/+3
* | - Fixed bug #61978 (Object recursion not detected for classes that implement ...Felipe Pena2012-05-081-0/+47
* | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards informat...Stanislav Malyshev2012-05-013-37/+21
* | 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
* | Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with...Ilia Alshanetsky2011-10-171-0/+13
* | 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
* | 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
* | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-202-1/+27
* | Rename JSON_Serializable to JsonSerializable per ML discussionSara Golemon2010-05-121-1/+1
* | Add JSON_Serializable interfaceSara Golemon2010-05-051-0/+80
* | - 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