summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug #77843Nikita Popov2019-04-232-2/+35
|
* Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-155-6/+0
| | | | | | | | | | | | | | | | | | | | | | | 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-145-5/+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-131-1/+1
|
* year++Xinchen Hui2018-01-0210-10/+10
|
* 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-152-2/+21
| |
* | Prevent from being affected by local php.iniXinchen Hui2017-10-136-1/+11
| |
* | Reset utf8_invalid in json scannerJakub Zelenka2017-08-102-0/+2
| |
* | Fix possible overflow in json scanner utf8_invalid_countJakub Zelenka2017-08-102-4/+18
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Darek Slusarczyk2017-08-081-1/+1
|\ \ | |/ | | | | | | # Conflicts: # ext/json/config.w32
| * 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
| | |
* | | Fix segfault in json ignoring of invalid UTF8Jakub Zelenka2017-08-063-1/+22
| | |
* | | Bump PHP_JSON_VERSION to 1.6.0Jakub Zelenka2017-07-161-1/+1
| | |
* | | [ci skip] Remove CSV leftovers from json code - $Id$Jakub Zelenka2017-07-163-6/+0
| | |
* | | Introduce internal php_json_encode_ex to allow extensions setting depthJakub Zelenka2017-07-162-5/+9
| | |
* | | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-169-198/+713
| | | | | | | | | | | | | | | It implements request #65082 and adds options for replacing resp. ignoring invalid UTF-8 sequences for json_encode and json_decode.
* | | Avoid useless dereferences and separations during paramter passing.Dmitry Stogov2017-06-191-1/+1
| | |
* | | Optimization for fast path.Dmitry Stogov2017-06-191-80/+83
| | |
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-06-183-695/+626
|\ \ \ | |/ /
| * | 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
| | |
* | | Fixed performance degradaton introduced in f6ac96bDmitry Stogov2017-06-131-17/+23
| | |
* | | Improve and simplify UTF-8 validation in JSONJakub Zelenka2017-06-111-50/+16
| | |
* | | Improved UTF-8 validation in JSONDmitry Stogov2017-05-251-27/+10
| | |
* | | Don't suppress warnings in testsCraig Duncan2017-04-023-6/+0
| | |
* | | Allow JSON_OBJECT_AS_ARRAY option to actually have meaningSara Golemon2017-03-172-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Options can only be passed if $assoc is passed, but passing assoc clobbers any attempt to pass JSON_OBJECT_AS_ARRAY as an option. Allow the option to occur in the options field by handling "null" as default/use-options.
* | | add nmakefile fragment for jsonAnatol Belski2017-01-042-0/+8
| | |
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0210-10/+10
| | |
* | | Use new param API in jsonSara Golemon2016-12-311-6/+13
| | |
* | | Merge branch 'PHP-7.1'Anatol Belski2016-11-221-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: remove TSRMLS_*
| * | 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.1'Jakub Zelenka2016-11-201-1/+1
|\ \ \ | |/ /
| * | 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
| | |
* | | json_encode(): Detect recursion earlierNikita Popov2016-11-194-24/+19
| | | | | | | | | | | | | | | | | | | | | json_encode() used a peculiar way of apply-count management, whereby the apply-count was not incremented for the outermost object/array, so that recursion was only detected after two levels.
* | | Merge branch 'PHP-7.1'Jakub Zelenka2016-10-305-47/+116
|\ \ \ | |/ /
| * | 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.
* | | Merge branch 'PHP-7.1'Dmitry Stogov2016-10-191-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
| * | Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)Dmitry Stogov2016-10-191-0/+4
| | |
* | | Install ext/json headers so that other extension can parse, tooJohannes Schlüter2016-10-181-1/+1
|/ /
* | 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
View Lorry Controller Status