diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
| commit | d68b614b09b984e915db50b72430db4e4731480c (patch) | |
| tree | 2826c121a85bb3556dffdf971709574efd80d3a2 /ext/json/tests/json_encode_basic.phpt | |
| parent | 1fc5659ebd6f2898ab474087f7877bcc4e774403 (diff) | |
| parent | 36fa17a5fae84ab332366a202f0a709279a2466a (diff) | |
| download | php-git-d68b614b09b984e915db50b72430db4e4731480c.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Improve json_encode error handling
- BFN
- BFN
Diffstat (limited to 'ext/json/tests/json_encode_basic.phpt')
| -rw-r--r-- | ext/json/tests/json_encode_basic.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt index 152e24444c..7ee68c58ca 100644 --- a/ext/json/tests/json_encode_basic.phpt +++ b/ext/json/tests/json_encode_basic.phpt @@ -151,8 +151,8 @@ string(4) "null" string(4) "null" -- Iteration 26 -- -Warning: json_encode(): type is unsupported, encoded as null in %s on line %d -string(4) "null" +Warning: json_encode(): type is unsupported in %s on line %d +bool(false) -- Iteration 27 -- string(82) "{"MyInt":99,"MyFloat":123.45,"MyBool":true,"MyNull":null,"MyString":"Hello World"}" -===Done===
\ No newline at end of file +===Done=== |