summaryrefslogtreecommitdiff
path: root/ext/json/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2017-12-306-6/+4
|\
| * Use seialize_precision instead of precision in all json testsJakub Zelenka2017-12-306-6/+6
* | Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)Jakub Zelenka2017-10-151-0/+14
* | Prevent from being affected by local php.iniXinchen Hui2017-10-136-1/+11
* | Fix segfault in json ignoring of invalid UTF8Jakub Zelenka2017-08-061-1/+20
* | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-162-0/+60
* | Don't suppress warnings in testsCraig Duncan2017-04-023-6/+0
* | Allow JSON_OBJECT_AS_ARRAY option to actually have meaningSara Golemon2017-03-171-0/+28
* | json_encode(): Detect recursion earlierNikita Popov2016-11-193-4/+4
|/
* Introduce json encoder to fix globals related issuesJakub Zelenka2016-10-302-0/+40
* Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-192-1/+24
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-191-0/+24
| |\
| | * Do not wrap user exception in case of custom JSON serializationJulien Pauli2016-09-191-0/+24
* | | Add test for fixed bug #68992Jakub Zelenka2016-08-291-0/+30
* | | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-08-141-0/+15
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2016-08-141-0/+15
| |\ \ | | |/
| | * Fixed bug #72787 (json_decode reads out of bounds)Jakub Zelenka2016-08-141-0/+15
* | | Fixed test according to FR #46600 ("_empty_" key in objects)Dmitry Stogov2016-06-221-3/+3
* | | Use empty keys instead of _empty_ in json decodingJakub Zelenka2016-06-203-9/+9
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-05-061-32/+0
|\ \ \ | |/ /
| * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-061-32/+0
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-05-061-0/+32
|\ \ \ | |/ /
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-061-0/+32
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-04-221-0/+29
|\ \ \ | |/ /
| * | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-221-0/+29
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-221-0/+10
|\ \ \ | |/ /
| * | Update test scriptXinchen Hui2016-03-221-0/+10
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-211-0/+17
|\ \ \ | |/ /
| * | Fix bug #71835 (json_encode sometimes incorrectly detects recursion with Json...Jakub Zelenka2016-03-201-0/+17
* | | json_encode: Escape U+2028 and U+2029 more often.Eddie Kohler2016-01-221-0/+36
|/ /
* | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2015-11-1532-253/+185
|\ \ | |/
| * Use the same CS for all json testsJakub Zelenka2015-11-1532-252/+185
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-212-0/+43
|\ \ | |/
| * Add tests for json_last_error()/json_last_error_msg() failuresKubo22015-07-212-0/+43
* | Fix incompatible JSON errorsJakub Zelenka2015-06-281-0/+16
* | Fix bug #62010 (json_decode produces invalid byte-sequences)Jakub Zelenka2015-06-281-0/+15
* | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-211-0/+25
* | Added test for bug 69187Hugo Fonseca2015-03-071-0/+33
* | Merge branch 'PHP-5.6'Jakub Zelenka2015-02-221-0/+14
|\ \ | |/
| * Merge branch 'PHP-5.5' into PHP-5.6Jakub Zelenka2015-02-221-0/+14
| |\
| | * Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p...Jakub Zelenka2015-02-221-0/+14
| * | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-042-18/+2
| |\ \ | | |/
| | * Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-042-18/+2
* | | Fix invalid test for bug 54484Jakub Zelenka2015-02-021-1/+1
* | | Merge branch 'master' into jsondJakub Zelenka2015-02-022-2/+18
|\ \ \
| * \ \ Merge branch 'PHP-5.6'Adam Harvey2015-02-022-2/+18
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-02-022-2/+18
| | |\ \ | | | |/
| | | * json_decode() should generate a syntax error when given "".Adam Harvey2015-02-022-2/+18
* | | | Merge branch 'master' into jsondJakub Zelenka2015-01-251-0/+17
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-0/+60
| |\ \ \ | | |/ /