10 files changed, 80 insertions, 49 deletions
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index ab63711008..71874525a7 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -10,11 +10,17 @@ $a[] = &$a;
 
 var_dump($a);
 
+echo "\n";
+
 var_dump(json_encode($a));
 var_dump(json_last_error());
+var_dump(json_last_error(true));
+
+echo "\n";
 
 var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
 var_dump(json_last_error());
+var_dump(json_last_error(true));
 
 echo "Done\n";
 ?>
@@ -27,11 +33,11 @@ array(1) {
   }
 }
 
-Warning: json_encode(): recursion detected in %s on line %d
 bool(false)
 int(6)
+string(%d) "Recursion detected"
 
-Warning: json_encode(): recursion detected in %s on line %d
 string(8) "[[null]]"
 int(6)
+string(%d) "Recursion detected"
 Done
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 9f9abfe46a..49c543edca 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -10,11 +10,17 @@ $a->prop = $a;
 
 var_dump($a);
 
+echo "\n";
+
 var_dump(json_encode($a));
 var_dump(json_last_error());
+var_dump(json_last_error(true));
+
+echo "\n";
 
 var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
 var_dump(json_last_error());
+var_dump(json_last_error(true));
 
 echo "Done\n";
 ?>
@@ -24,11 +30,11 @@ object(stdClass)#%d (1) {
   *RECURSION*
 }
 
-Warning: json_encode(): recursion detected in %s on line %d
 bool(false)
 int(6)
+string(%d) "Recursion detected"
 
-Warning: json_encode(): recursion detected in %s on line %d
 string(22) "{"prop":{"prop":null}}"
 int(6)
+string(%d) "Recursion detected"
 Done
diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt
index fb59b71c96..48bd7ad524 100644
--- a/ext/json/tests/bug43941.phpt
+++ b/ext/json/tests/bug43941.phpt
@@ -14,15 +14,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 string(5) ""abc""
-
-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
 string(4) "null"
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
 string(17) "[null,null,"abc"]"
 Done
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index 079906fa33..111438ddc4 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -12,9 +12,5 @@ var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE));
 --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 >𝄞<""
-
-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)
diff --git a/ext/json/tests/bug54058.phpt b/ext/json/tests/bug54058.phpt
index e3596eb62b..2c2304578e 100644
--- a/ext/json/tests/bug54058.phpt
+++ b/ext/json/tests/bug54058.phpt
@@ -9,17 +9,20 @@ $bad_utf8 = quoted_printable_decode('=B0');
 
 json_encode($bad_utf8);
 var_dump(json_last_error());
+var_dump(json_last_error(true));
 
 $a = new stdclass;
 $a->foo = quoted_printable_decode('=B0');
 json_encode($a);
 var_dump(json_last_error());
+var_dump(json_last_error(true));
 
 $b = new stdclass;
 $b->foo = $bad_utf8;
 $b->bar = 1;
 json_encode($b);
 var_dump(json_last_error());
+var_dump(json_last_error(true));
 
 $c = array(
     'foo' => $bad_utf8,
@@ -27,17 +30,15 @@ $c = array(
 );
 json_encode($c);
 var_dump(json_last_error());
+var_dump(json_last_error(true));
+
 ?>
 --EXPECTF--
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
 int(5)
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
 int(5)
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
 int(5)
-
-Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
 int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt
new file mode 100644
index 0000000000..f6bb02bae4
--- /dev/null
+++ b/ext/json/tests/bug61537.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #61537 (json_encode() incorrectly truncates/discards information)
+--SKIPIF--
+<?php if (!extension_loaded("json")) print "skip"; ?>
+--FILE--
+<?php
+$invalid_utf8 = "\x9f";
+
+var_dump(json_encode($invalid_utf8));
+var_dump(json_last_error(), json_last_error(true));
+
+var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR));
+var_dump(json_last_error(), json_last_error(true));
+
+echo "\n";
+
+$invalid_utf8 = "an invalid sequen\xce in the middle of a string";
+
+var_dump(json_encode($invalid_utf8));
+var_dump(json_last_error(), json_last_error(true));
+
+var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR));
+var_dump(json_last_error(), json_last_error(true));
+
+?>
+--EXPECTF--
+bool(false)
+int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
+string(4) "null"
+int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
+
+bool(false)
+int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
+string(4) "null"
+int(5)
+string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt
index 4c863c689e..c34b03f8f7 100644
--- a/ext/json/tests/bug61978.phpt
+++ b/ext/json/tests/bug61978.phpt
@@ -31,17 +31,13 @@ class JsonTest2 implements JsonSerializable {
 $obj1 = new JsonTest1();
 var_dump(json_encode($obj1, JSON_PARTIAL_OUTPUT_ON_ERROR));
 
-echo "\n==\n";
+echo "==\n";
 
 $obj2 = new JsonTest2();
 var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR));
 
 ?>
 --EXPECTF--
-Warning: json_encode(): recursion detected in %s on line %d
 string(44) "{"test":"123","me":{"test":"123","me":null}}"
-
 ==
-
-Warning: json_encode(): recursion detected in %s on line %d
 string(44) "{"test":"123","me":{"test":"123","me":null}}"
diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt
index a3ed5e7b88..f12e902d9f 100644
--- a/ext/json/tests/inf_nan_error.phpt
+++ b/ext/json/tests/inf_nan_error.phpt
@@ -8,37 +8,36 @@ $inf = INF;
 var_dump($inf);
 
 var_dump(json_encode($inf));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
 
 var_dump(json_encode($inf, JSON_PARTIAL_OUTPUT_ON_ERROR));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
+
+echo "\n";
 
 $nan = NAN;
 
 var_dump($nan);
 
 var_dump(json_encode($nan));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
 
 var_dump(json_encode($nan, JSON_PARTIAL_OUTPUT_ON_ERROR));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
 ?>
 --EXPECTF--
 float(INF)
-
-Warning: json_encode(): double INF does not conform to the JSON spec in %s on line %d
 bool(false)
 int(7)
-
-Warning: json_encode(): double INF does not conform to the JSON spec in %s on line %d
+string(34) "Inf and NaN cannot be JSON encoded"
 string(1) "0"
 int(7)
-float(NAN)
+string(34) "Inf and NaN cannot be JSON encoded"
 
-Warning: json_encode(): double NAN does not conform to the JSON spec in %s on line %d
+float(NAN)
 bool(false)
 int(7)
-
-Warning: json_encode(): double NAN does not conform to the JSON spec in %s on line %d
+string(34) "Inf and NaN cannot be JSON encoded"
 string(1) "0"
 int(7)
+string(34) "Inf and NaN cannot be JSON encoded"
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 7ee68c58ca..fc348eed81 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -150,8 +150,6 @@ string(4) "null"
 -- Iteration 25 --
 string(4) "null"
 -- Iteration 26 --
-
-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"}"
diff --git a/ext/json/tests/unsupported_type_error.phpt b/ext/json/tests/unsupported_type_error.phpt
index 2564c6a3c8..f36afb44a5 100644
--- a/ext/json/tests/unsupported_type_error.phpt
+++ b/ext/json/tests/unsupported_type_error.phpt
@@ -8,19 +8,17 @@ $resource = fopen(__FILE__, "r");
 var_dump($resource);
 
 var_dump(json_encode($resource));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
 
 var_dump(json_encode($resource, JSON_PARTIAL_OUTPUT_ON_ERROR));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error(true));
 
 ?>
 --EXPECTF--
 resource(5) of type (stream)
-
-Warning: json_encode(): type is unsupported in %s on line %d
 bool(false)
 int(8)
-
-Warning: json_encode(): type is unsupported in %s on line %d
+string(21) "Type is not supported"
 string(4) "null"
 int(8)
+string(21) "Type is not supported"