summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
Commit message (Collapse)AuthorAgeFilesLines
* Implement enumsIlija Tovilo2021-03-171-1/+2
| | | | | | | | RFC: https://wiki.php.net/rfc/enumerations Co-authored-by: Nikita Popov <nikita.ppv@gmail.com> Closes GH-6489.
* Replace zend_bool uses with boolNikita Popov2021-01-151-1/+1
| | | | | | | We're starting to see a mix between uses of zend_bool and bool. Replace all usages with the standard bool type everywhere. Of course, zend_bool is retained as an alias.
* Constify char * arguments of APIstwosee2020-06-081-2/+2
| | | | Closes GH-5676.
* Remove mention of PHP major version in Copyright headersGabriel Caruso2019-09-251-2/+0
| | | | Closes GH-4732.
* Bump PHP_JSON_VERSION to PHP_VERSIONPeter Kokot2019-07-241-1/+3
| | | | Closes GH-4459
* Remove local variablesPeter Kokot2019-02-031-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
* Remove yearly range from copyright noticeZeev Suraski2019-01-301-1/+1
|
* Bump PHP_JSON_VERSION to 1.7.0Jakub Zelenka2018-06-141-1/+1
|
* year++Xinchen Hui2018-01-021-1/+1
|
* Merge JSON_THROW_ON_ERRORAndrea Faulds2017-10-221-0/+1
|
* 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-161-2/+0
|
* Introduce internal php_json_encode_ex to allow extensions setting depthJakub Zelenka2017-07-161-1/+1
|
* Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-161-14/+18
| | | | | It implements request #65082 and adds options for replacing resp. ignoring invalid UTF-8 sequences for json_encode and json_decode.
* Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
|
* Bump PHP_JSON_VERSION to 1.5.0Jakub Zelenka2016-08-291-1/+1
|
* Add return code from json API functionsJakub Zelenka2016-06-281-4/+4
| | | | It will allow fix few json bugs in a better way
* Merge branch 'PHP-7.0'Nikita Popov2016-03-031-2/+2
|\
| * Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | | | | | Also re bug #71575.
| * Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
| |
* | json_encode: Escape U+2028 and U+2029 more often.Eddie Kohler2016-01-221-0/+1
|/ | | | | | | | | 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.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
* | Move json_decode options macros bellow encode optionsJakub Zelenka2015-09-041-4/+4
| |
* | json: fix formating of PHP_JSON* option bitshiftsRyan McCullagh2015-09-041-12/+12
| |
* | these need to be exported for extensions that use jsonJoe Watkins2015-09-031-1/+1
| |
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+3
| |
* | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-211-0/+1
| |
* | Set PHP_JSON_VERSION to 1.4.0Jakub Zelenka2015-02-171-1/+1
| |
* | fix json globalsMichael Wallner2015-02-091-0/+1
| |
* | Give me creditJakub Zelenka2015-02-021-0/+1
| |
* | Merge branch 'master' into jsondJakub Zelenka2015-01-251-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c
| * \ Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-0/+1
| |\ \ | | |/ | | | | | | | | | | | | * 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/+1
| | |
| | * bump yearXinchen Hui2015-01-151-1/+1
| | |
| | * Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
| | |
| * | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | Porting implementation of RFC json_preserve_fractional_partJuan Basso2015-01-121-0/+1
| | |
* | | Merge branch 'master' into jsondJakub Zelenka2014-12-271-5/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/JSON_parser.h ext/json/config.m4 ext/json/config.w32 ext/json/json.c ext/json/php_json.h
| * | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-4/+4
| | |
| * | ext/iconv, ext/json and ext/session use static tsrmls pointerAnatol Belski2014-10-171-1/+4
| | |
* | | Add missing bits to php_json.hJakub Zelenka2014-11-251-14/+18
| | |
* | | Add error codes to php_json.hJakub Zelenka2014-11-161-0/+13
|/ /
* | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | fix signatureAnatol Belski2014-08-271-1/+1
| |
* | fix signatureAnatol Belski2014-08-271-1/+1
| |
* | master renames phase 1Anatol Belski2014-08-251-2/+2
| |
* | ported ext/jsonAnatol Belski2014-08-191-2/+2
| |
* | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
|/
View Lorry Controller Status