summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-04-232-2/+35
|\
| * 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
| |
* | 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
| |
* | Sync with e0fe6674Anatol Belski2018-08-131-1/+1
| |
* | Fix bug #76030 RE2C_FLAGS rarely honouredCristian Rodríguez2018-08-121-1/+1
| | | | | | | | | | | | | | | | | | Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build systems there is also optional configure option --enable-re2c-cgoto which enables optimized conditional jumps using non-standard computed goto extension. It is available since RE2C 0.10.3 so it's well covered by RE2C versions PHP uses. This patch syncs usage of -g option accross the PHP Unix-alike build system.
* | Make more tests run on 64bit plataformsGabriel Caruso2018-07-301-2/+1
| |
* | Regenerate scanners using re2c version >= 1.0.0 (newer version, at least, ↵Dmitry Stogov2018-07-252-45/+41
| | | | | | | | produce less code)
* | Remove unused Git attributes identPeter Kokot2018-07-252-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* | Revert "Rename _zval_dtor_func to _ref_dtor_func"Xinchen Hui2018-07-062-768/+718
| | | | | | | | This reverts commit a362ae6b12419369c5cbdbb4e924915f9b196ef6.
* | Rename _zval_dtor_func to _ref_dtor_funcXinchen Hui2018-07-062-718/+768
| |
* | Use zval_ptr_dtor_nogc() in JSON parser (it can't produce circular data ↵Dmitry Stogov2018-07-052-26/+26
| | | | | | | | structures)
* | Bump PHP_JSON_VERSION to 1.7.0Jakub Zelenka2018-06-141-1/+1
| |
* | php_json_escape_string() optimizationDmitry Stogov2018-06-131-35/+60
| |
* | Removed useless zval_ptr_dtor()Dmitry Stogov2018-05-291-1/+1
| |
* | Use zend_string_release_ex() instread of zend_string_release() in places, ↵Dmitry Stogov2018-05-283-12/+12
| | | | | | | | where we sure about string persistence.
* | Bit test optimizationDmitry Stogov2018-05-081-1/+1
| |
* | Bit check micro-optimizationDmitry Stogov2018-04-281-1/+1
| |
* | Use int instead of long in protosGabriel Caruso2018-02-231-1/+1
| |
* | Use EXPECT instead of EXPECTF when possibleGabriel Caruso2018-02-2017-17/+17
| | | | | | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it.
* | Add missing SKIPIF sectionsGabriel Caruso2018-02-034-0/+9
| |
* | Add tests for `json_decode` with depth below 0Nat Zimmermann2018-01-241-0/+8
| |
* | Trailing whitespacesGabriel Caruso2018-01-031-33/+33
| | | | | | | | Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
* | year++Xinchen Hui2018-01-0210-10/+10
| |
* | Merge branch 'PHP-7.2'Jakub Zelenka2017-12-306-6/+4
|\ \ | |/
| * 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
| | |
* | | RC manipulation cleanup 2Xinchen Hui2017-11-023-14/+8
| | |
* | | Merge JSON_THROW_ON_ERRORAndrea Faulds2017-10-225-34/+218
| | |
* | | Merge branch 'PHP-7.2'Jakub Zelenka2017-10-152-2/+21
|\ \ \ | |/ /
| * | Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)Jakub Zelenka2017-10-152-2/+21
| | |
* | | Merge branch 'PHP-7.2'Xinchen Hui2017-10-136-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Prevent from being affected by local php.ini Added skipf
| * | Prevent from being affected by local php.iniXinchen Hui2017-10-136-1/+11
| | |
* | | Refactored recursion pretectionDmitry Stogov2017-10-061-16/+16
| | |
* | | Sync json parser defsAnatol Belski2017-09-201-2/+4
| | |
* | | Refactored array creation API. array_init() and array_init_size() are ↵Dmitry Stogov2017-09-201-2/+4
|/ / | | | | | | converted into macros calling zend_new_array(). They are not functions anymore and don't return any values.
* | 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
| | |
View Lorry Controller Status