diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-23 21:14:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-23 21:14:45 +0200 |
| commit | 36fa17a5fae84ab332366a202f0a709279a2466a (patch) | |
| tree | 409c529b90ee598cfcc04357b9d4904735c89edd /ext/json/tests/bug53946.phpt | |
| parent | e8862725770c3d5ee27c6c8c8a01b226b610fa08 (diff) | |
| parent | 84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f (diff) | |
| download | php-git-36fa17a5fae84ab332366a202f0a709279a2466a.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
Diffstat (limited to 'ext/json/tests/bug53946.phpt')
| -rw-r--r-- | ext/json/tests/bug53946.phpt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt index abbb81238b..079906fa33 100644 --- a/ext/json/tests/bug53946.phpt +++ b/ext/json/tests/bug53946.phpt @@ -9,8 +9,12 @@ var_dump(json_encode("latin 1234 -/ russian мама мыла раму speci var_dump(json_encode("ab\xE0")); var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE)); ?> ---EXPECT-- +--EXPECTF-- string(156) ""latin 1234 -\/ russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443 specialchars \u0002 \b \n U+1D11E >\ud834\udd1e<"" string(100) ""latin 1234 -\/ russian мама мыла раму specialchars \u0002 \b \n U+1D11E >𝄞<"" -string(4) "null" -string(4) "null" + +Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d +bool(false) + +Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d +bool(false) |