summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
|
* Use the same CS for all json testsJakub Zelenka2015-11-1532-252/+185
|
* Add tests for json_last_error()/json_last_error_msg() failuresKubo22015-07-212-0/+43
|
* Merge remote-tracking branch 'github/pr/637' into PHP-5.6Stanislav Malyshev2015-04-186-219/+2
|\ | | | | | | | | * github/pr/637: Remove unused code from ext/json.
| * Remove unused code from ext/json.Rouven Weßling2014-03-304-199/+2
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Jakub Zelenka2015-02-222-17/+27
|\ \ | | | | | | | | | | | | Conflicts: ext/json/json.c
| * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers ↵Jakub Zelenka2015-02-222-11/+21
| | | | | | | | | | | | plus the letter e)
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-043-19/+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-043-19/+2
| | | | | | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-02-023-2/+19
|\ \ \ | |/ /
| * | json_decode() should generate a syntax error when given "".Adam Harvey2015-02-023-2/+19
| | | | | | | | | | | | | | | Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us.
| * | Bump yearXinchen Hui2015-01-152-2/+2
| | |
* | | Fixed bug #50224 where float without decimals were converted to integerJuan Basso2015-01-193-8/+90
| | |
* | | bump yearXinchen Hui2015-01-152-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: typofixes
| * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | * PHP-5.4: typofixes
| | * | typofixesVeres Lajos2014-08-171-1/+1
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-132-8/+30
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * PHP-5.5: Fix #66021 (Blank line inside empty array/object)
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-8/+30
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix #66021 (Blank line inside empty array/object)
| | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-132-8/+30
| | |\ | | | | | | | | | | | | | | | | * pull-request/518: Fix #66021 (Blank line inside empty array/object)
| | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-022-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-172-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: Export JsonSerializable Interface (bug #65753)
| | * | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
| | | |
| | * | Bump yearXinchen Hui2014-01-032-2/+2
| | | |
| * | | Bump yearXinchen Hui2014-01-032-2/+2
| | | |
* | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
| | | |
* | | | Bump yearXinchen Hui2014-01-032-2/+2
| | | |
* | | | Fixed case part of bug #64874 ("json_decode handles whitespace and ↵Andrea Faulds2013-11-112-3/+72
|/ / / | | | | | | | | | case-sensitivity incorrectly")
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-102-8/+139
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 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-172-8/+73
| |/ | | | | | | case-sensitivity incorrectly")
| * Happy New YearXinchen Hui2013-01-012-2/+2
| |
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-211-2/+2
| |
* | Happy New YearXinchen Hui2013-01-012-2/+2
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2012-12-112-3/+60
|\ \ | |/ | | | | | | * 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-112-3/+60
| | | | | | | | Fixes bug #63737 (json_decode does not properly decode with options parameter).
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-261-17/+22
|\ \ | |/ | | | | | | * PHP-5.4: Related bug #63588 fix length computation + optimize for speed
| * Related bug #63588 fix length computation + optimize for speedRemi Collet2012-11-261-17/+22
| | | | | | | | | | | | 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.
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-255-67/+31
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #63588 Duplicate implementation of php_next_utf8_char
| * Fixed bug #63588 Duplicate implementation of php_next_utf8_charRemi Collet2012-11-255-67/+31
| | | | | | | | | | | | | | | | | | 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.
| * Revert JSON merges to 5.4Nikita Popov2012-07-0116-232/+47
| | | | | | | | | | | | | | | | 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-292-4/+2
| |
* | Add optional depth parameter to json_encode #62369Florian Anderiasch2012-07-243-1/+44
|/
* fix bug #61359: json_encode() calls too many reallocsStanislav Malyshev2012-06-301-9/+12
|
* Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-288-42/+51
|\ | | | | | | | | * PHP-5.3: Add json_last_error_msg() function
| * Add json_last_error_msg() functionNikita Popov2012-06-288-42/+51
| | | | | | | | | | 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-2711-58/+113
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Improve JSON error handling Conflicts: ext/json/tests/bug54058.phpt ext/json/tests/bug61537.phpt
| * Improve JSON error handlingNikita Popov2012-06-278-49/+92
| | | | | | | | | | | | | | | | | | 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-2314-26/+147
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Improve json_encode error handling - BFN Conflicts: ext/json/json.c
View Lorry Controller Status