589d0e0f18
Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
2016-04-22 21:41:44 -07:00
b49ec68134
Update test script
2016-03-22 11:28:19 +08:00
7e069daa89
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20 15:56:27 +00:00
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
3c32019989
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-15 19:13:49 +00:00
e5abc53701
Use the same CS for all json tests
2015-11-15 19:06:09 +00:00
539db00538
Simplify JSON constants registration
2015-09-04 20:00:29 +01:00
6e5574807f
Add my name to authors for previous refactoring
...
Related to jsond changes
2015-09-04 19:56:59 +01:00
7fe2646be3
Move json_decode options macros bellow encode options
2015-09-04 19:37:12 +01:00
45fdff1c85
json: fix formating of PHP_JSON* option bitshifts
2015-09-04 19:29:54 +01:00
26e619b192
these need to be exported for extensions that use json
2015-09-03 19:28:34 +01:00
f18ba0f9c9
Add tests for json_last_error()/json_last_error_msg() failures
2015-07-21 01:50:40 +02:00
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
22767a48a7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add tests for json_last_error()/json_last_error_msg() failures
2015-07-21 02:00:16 +02:00
4540e644ec
Regenerate bison and re2c files in json
2015-07-18 17:41:17 +01:00
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
f30503ce4e
Fix incompatible JSON errors
...
This fixes differences in error codes with PHP 5 and 7.
The malformed UTF-8 and control character error codes are
now returned even in non-string context which makes it
the same as it was in PHP 5 json ext.
2015-06-28 18:09:10 +01:00
64c371142c
Fix bug #62010 (json_decode produces invalid byte-sequences)
2015-06-28 17:16:12 +01:00
695b4f4cad
Bump re2c version for json scanner
2015-06-28 16:48:42 +01:00
f3df3df873
Fix bug #68546 (json_decode cannot access property started with \0)
2015-06-21 15:30:33 +01:00
61de771afa
Improve json parser code
2015-06-07 15:22:09 +01:00
359df4dea8
Tidy up and regenerate json parser with latest bison version
2015-05-10 18:08:16 +01:00
76fb02123f
Optimized json_parser
...
1. use zend_string in key
2. use faster APIs
3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy)
2015-05-06 11:37:30 +08:00
9f0dbdf6c8
Use Z_ARRVAL_P since we already know it's an array
2015-05-06 11:10:33 +08:00
d66cb721d4
Merge remote-tracking branch 'github/pr/637' into PHP-5.6
...
* github/pr/637:
Remove unused code from ext/json.
2015-04-18 17:56:33 -07:00
fe36285de2
fix datatype mismatches
2015-03-25 15:32:35 +01:00
a4384bd3d4
s/PHP Version 5/PHP Version 7/g
...
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
d68861eb4b
Improved php_json_escape_string()
2015-03-11 15:03:07 +03:00
609f05fc19
ZTS cleanup
2015-03-08 19:25:55 +08:00
baece85399
Added test for bug 69187
2015-03-07 10:53:31 +00:00
ad2b751985
Merge branch 'PHP-5.6'
...
The fix for master is a bit different (it's fixed in encoder)
2015-02-22 20:54:05 +00:00
97d809a8a5
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/json/json.c
2015-02-22 20:35:03 +00:00
591dbcabe5
Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)
2015-02-22 20:22:47 +00:00
3ddc246b5a
Set PHP_JSON_VERSION to 1.4.0
2015-02-17 20:52:06 +00:00
011eab1047
Delete json outdated package.xml
...
The package.xml has not been update for more then 8 years and
there is no reason to keep it. It would require quite
a bit of digging in git history to update it which is
not worth it.
2015-02-16 20:07:01 +00:00
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
5f82c9256d
Update JSON Readme
2015-02-15 20:04:16 +00:00
549c6fa465
Remove unused destructor in json parser
2015-02-15 19:46:41 +00:00
911f7b10b1
Add bison 3.0.4 genereted files for json parser
...
The definitions file (json_parser.tab.h) contains file
system dependent name for C preprocessor guard:
YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
This is because the srcdir is used for default definitions name.
It's a correct default (--definition=$(srcdir)/json_parser.tab.h)
because the build would fail otherwise. Unfortunately Bison does not have
a special option for defining cpp guard name. The only way would be
using skeleton file but that's not possible with the current
configuration as it requires using a specific bison version
(disallowing range of supported versions).
2015-02-15 19:28:37 +00:00
09d27da1ba
Regenerate json scanner with re2c 0.13.7.5
2015-02-15 18:08:58 +00:00
ca9ab1c993
better alignment + support size_t
2015-02-10 16:02:55 +01:00
4a875e18fd
use portable strtol
2015-02-10 13:06:57 +01:00
09a3e7377a
fix json globals
2015-02-09 17:57:18 +01:00
8989354130
regenerated scanner
2015-02-09 11:22:50 +01:00
ef2fd13de8
fix datatype mismatches
2015-02-09 11:06:02 +01:00
12fff5251b
fix inconsistend dll linkage warn
2015-02-09 10:51:29 +01:00
Xinchen Hui