summaryrefslogtreecommitdiff
path: root/ext/json/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
| * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-061-32/+0
| | | | | | | | | | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-05-061-0/+32
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-061-0/+32
| | | | | | | | | | | | I don't want use zend_try here, but seems I have no choice :<
* | | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Update test script
| * | Update test scriptXinchen Hui2016-03-221-0/+10
| | |
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-211-0/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
| * | Fix bug #71835 (json_encode sometimes incorrectly detects recursion with ↵Jakub Zelenka2016-03-201-0/+17
| | | | | | | | | | | | JsonSerializable)
* | | json_encode: Escape U+2028 and U+2029 more often.Eddie Kohler2016-01-221-0/+36
|/ / | | | | | | | | | | | | | | | | These characters are illegal in Javascript, so leaving them unescaped is risky. The default encoder ($flags = 0) is fine, but the encoder with JSON_UNESCAPED_UNICODE flag is not. In case anyone wants the ability to leave these characters unescaped, provide JSON_UNESCAPED_LINE_TERMINATORS.
* | 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
|\ \ | |/ | | | | | | * PHP-5.6: Add tests for json_last_error()/json_last_error_msg() failures
| * Add tests for json_last_error()/json_last_error_msg() failuresKubo22015-07-212-0/+43
| |
* | Fix incompatible JSON errorsJakub Zelenka2015-06-281-0/+16
| | | | | | | | | | | | | | This fixes differences in error codes with PHP 5 and 7. The malformed UTF-8 and control character error codes are now returned even in non-string context which makes it the same as it was in PHP 5 json ext.
* | 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
|\ \ | |/ | | | | The fix for master is a bit different (it's fixed in encoder)
| * Merge branch 'PHP-5.5' into PHP-5.6Jakub Zelenka2015-02-221-0/+14
| |\ | | | | | | | | | | | | Conflicts: ext/json/json.c
| | * Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers ↵Jakub Zelenka2015-02-221-0/+14
| | | | | | | | | | | | plus the letter e)
| * | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-042-18/+2
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.5: Revert "json_decode() should generate a syntax error when given ""." Update NEWS
| | * Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-042-18/+2
| | | | | | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.
* | | 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
| | | | | | | | | | | | | | | | | | | | Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us.
* | | | Merge branch 'master' into jsondJakub Zelenka2015-01-251-0/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-0/+60
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #50224 where float without decimals were converted to integer Updated NEWS for #68371
| | * | Fixed bug #50224 where float without decimals were converted to integerJuan Basso2015-01-191-0/+60
| | | |
| * | | Fix bug #68817: Null pointer deferenceStanislav Malyshev2015-01-141-0/+17
| | | |
* | | | Porting implementation of RFC json_preserve_fractional_partJuan Basso2015-01-121-0/+60
| | | |
* | | | Modify json/tests/pass003 to ignore internal object IDJakub Zelenka2014-12-121-5/+5
|/ / / | | | | | | | | | Child is now created first - bottom up parsing (LR)
* | | Port JSONNikita Popov2014-05-051-1/+1
|/ /
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-0/+20
|\ \ | |/ | | | | | | * PHP-5.5: Fix #66021 (Blank line inside empty array/object)
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-0/+20
| |\ | | | | | | | | | | | | * PHP-5.4: Fix #66021 (Blank line inside empty array/object)
| | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-131-0/+20
| | |\ | | | | | | | | | | | | | | | | * pull-request/518: Fix #66021 (Blank line inside empty array/object)
| | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-021-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | Fixed case part of bug #64874 ("json_decode handles whitespace and ↵Andrea Faulds2013-11-111-0/+69
|/ / / | | | | | | | | | case-sensitivity incorrectly")
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-101-0/+117
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 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")
| * | Better test: Check combined leading/trailingAndrea Faulds2013-10-151-0/+66
| | |
| * | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and ↵Andrea Faulds2013-09-171-0/+51
| |/ | | | | | | case-sensitivity incorrectly")
* | 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.
View Lorry Controller Status