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/bug61978.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/bug61978.phpt')
| -rw-r--r-- | ext/json/tests/bug61978.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt index 2c732979ef..4c863c689e 100644 --- a/ext/json/tests/bug61978.phpt +++ b/ext/json/tests/bug61978.phpt @@ -29,12 +29,12 @@ class JsonTest2 implements JsonSerializable { $obj1 = new JsonTest1(); -var_dump(json_encode($obj1)); +var_dump(json_encode($obj1, JSON_PARTIAL_OUTPUT_ON_ERROR)); echo "\n==\n"; $obj2 = new JsonTest2(); -var_dump(json_encode($obj2)); +var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR)); ?> --EXPECTF-- |