summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-156-7/+1
| | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* Trim trailing whitespace in *.phptPeter Kokot2018-10-1414-21/+21
|
* Sync leading and final newlines in source code filesPeter Kokot2018-10-144-4/+0
| | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* Trim trailing whitespace in source code filesPeter Kokot2018-10-132-2/+2
|
* year++Xinchen Hui2018-01-0210-10/+10
|
* Use seialize_precision instead of precision in all json testsJakub Zelenka2017-12-306-6/+6
|
* Merge branch 'PHP-7.0' into PHP-7.1Darek Slusarczyk2017-08-081-1/+1
|\
| * JSON: fix config.w32 / Install headers on windowsDarek Slusarczyk2017-08-081-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-06-183-695/+626
|\ \ | |/
| * Regenerate and bump re2c version to 0.16Jakub Zelenka2017-06-183-642/+574
| | | | | | | | It also matches the re2c version for Zend language scanner
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-0410-10/+10
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-0410-10/+10
| |
* | Install ext/json headersJohannes Schlüter2016-12-071-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+2
|\ \ | |/ | | | | | | * PHP-7.0: remove TSRMLS_*
| * remove TSRMLS_*Anatol Belski2016-11-211-2/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-11-201-1/+1
|\ \ | |/
| * Fix bug #73526 (php_json_encode depth issue)Jakub Zelenka2016-11-201-1/+1
| |
* | Introduce json encoder to fix globals related issuesJakub Zelenka2016-10-305-47/+116
| | | | | | | | | | | | It fixes bugs #66025 and #73254 by replacing globals with a passed structure holding depth and error code. In addition it fixes #72069 in a more generic way.
* | Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)Dmitry Stogov2016-10-191-0/+4
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-193-2/+27
|\ \ | |/ | | | | | | | | | | | | * PHP-7.0: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json_encoder.c
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-192-1/+27
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json.c
| | * Do not wrap user exception in case of custom JSON serializationJulien Pauli2016-09-192-1/+27
| | |
* | | Fix 73113 - Segfault with throwing JsonSerializableJulien Pauli2016-09-191-1/+4
| | |
* | | Bump PHP_JSON_VERSION to 1.5.0Jakub Zelenka2016-08-291-1/+1
| | |
* | | Add test for fixed bug #68992Jakub Zelenka2016-08-291-0/+30
| | |
* | | Fix recursion and protection in the failed JSON encodingJakub Zelenka2016-08-291-11/+20
| | |
* | | Add initial failure checking for json_encodeJakub Zelenka2016-08-293-42/+56
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-08-142-0/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2016-08-142-0/+25
| |\ \ | | |/
| | * Fixed bug #72787 (json_decode reads out of bounds)Jakub Zelenka2016-08-142-0/+21
| | |
| * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-062-77/+38
| | | | | | | | | | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-062-38/+77
| | | | | | | | | | | | I don't want use zend_try here, but seems I have no choice :<
* | | Add return code from json API functionsJakub Zelenka2016-06-282-7/+12
| | | | | | | | | | | | It will allow fix few json bugs in a better way
* | | Use one place to define max length of doubleJakub Zelenka2016-06-262-18/+2
| | | | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose
* | | Replace json.precision with serialize_precisionJakub Zelenka2016-06-263-40/+2
| | |
* | | Add castYasuo Ohgaki2016-06-261-1/+1
| | |
* | | Simply use ndigit for flag for zend_dtoa modeYasuo Ohgaki2016-06-261-5/+2
| | |
* | | Add JSON_G(precision)Yasuo Ohgaki2016-06-263-3/+41
| | |
* | | Initial patch for 0 mode float conversion. The magic number is better to be ↵Yasuo Ohgaki2016-06-261-1/+5
| | | | | | | | | | | | improved. Any suggestion where to define it?
* | | Fixed test according to FR #46600 ("_empty_" key in objects)Dmitry Stogov2016-06-221-3/+3
| | |
* | | Fixed compilation warningsDmitry Stogov2016-06-225-555/+556
| | |
* | | Use empty keys instead of _empty_ in json decodingJakub Zelenka2016-06-206-18/+12
| | |
* | | Add php_json_yyparse for direct use in json extJakub Zelenka2016-05-111-0/+2
| | |
* | | Fix and clean up exporting of json parserJakub Zelenka2016-05-113-7/+17
| | |
* | | Merge branch 'json_parser_method' into json_parser_method_embedJakub Zelenka2016-05-033-1/+34
|\ \ \
| * \ \ Merge branch 'master' into json_parser_methodJakub Zelenka2016-05-033-1/+34
| |\ \ \
| | * \ \ Merge branch 'PHP-7.0'Xinchen Hui2016-04-223-1/+34
| | |\ \ \ | | | |/ /
| | | * | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-223-1/+34
| | | | |
* | | | | Use embedded json parser method structureJakub Zelenka2016-05-023-27/+27
|/ / / /
* | | | Remove json parser depth methods and tidy it upJakub Zelenka2016-04-103-111/+77
| | | |
View Lorry Controller Status