Improve type error messages when an object is given

From now on, we always display the given object's type instead of just reporting "object".
Additionally, make the format of return type errors match the format of argument errors.

Closes GH-5625

79 files changed, 138 insertions, 138 deletions

diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt
index a2f81090e7..acb641beb0 100644
--- a/ext/date/tests/014.phpt
+++ b/ext/date/tests/014.phpt
@@ -33,7 +33,7 @@ object(DateTimeZone)#%d (2) {
 }
 int(0)
 
-Fatal error: Uncaught TypeError: timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, object given in %s:%d
+Fatal error: Uncaught TypeError: timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, DateTime given in %s:%d
 Stack trace:
 #0 %s(%d): timezone_offset_get(Object(DateTime), Object(DateTimeZone))
 #1 {main}
diff --git a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt
index 3ac17de49f..4f542c82c8 100644
--- a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt
+++ b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt
@@ -24,4 +24,4 @@ object(DateTimeImmutable)#%d (3) {
   ["timezone"]=>
   string(13) "Europe/London"
 }
-DateTimeImmutable::createFromMutable(): Argument #1 ($object) must be of type DateTime, object given
+DateTimeImmutable::createFromMutable(): Argument #1 ($object) must be of type DateTime, DateTimeImmutable given
diff --git a/ext/date/tests/DateTime_createFromImmutable.phpt b/ext/date/tests/DateTime_createFromImmutable.phpt
index 6407333f06..59f6192214 100644
--- a/ext/date/tests/DateTime_createFromImmutable.phpt
+++ b/ext/date/tests/DateTime_createFromImmutable.phpt
@@ -30,4 +30,4 @@ object(DateTime)#%d (3) {
   string(13) "Europe/London"
 }
 bool(true)
-DateTime::createFromImmutable(): Argument #1 ($object) must be of type DateTimeImmutable, object given
+DateTime::createFromImmutable(): Argument #1 ($object) must be of type DateTimeImmutable, DateTime given
diff --git a/ext/date/tests/bug70245.phpt b/ext/date/tests/bug70245.phpt
index b45e8be931..58e7f10e13 100644
--- a/ext/date/tests/bug70245.phpt
+++ b/ext/date/tests/bug70245.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-strtotime(): Argument #2 ($now) must be of type ?int, object given
+strtotime(): Argument #2 ($now) must be of type ?int, DateTime given
diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt
index 9ab11355e8..1b13e62b25 100644
--- a/ext/date/tests/microtime_error.phpt
+++ b/ext/date/tests/microtime_error.phpt
@@ -51,7 +51,7 @@ microtime(): Argument #1 ($get_as_float) must be of type bool, array given
 
 --> bad arg: object(stdClass)#%d (0) {
 }
-microtime(): Argument #1 ($get_as_float) must be of type bool, object given
+microtime(): Argument #1 ($get_as_float) must be of type bool, stdClass given
 
 --> bad arg: int(1)
 float(%s)
diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
index 864dc54c2a..2d2f032dfd 100644
--- a/ext/date/tests/timezone_offset_get_error.phpt
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -65,7 +65,7 @@ try {
 *** Testing timezone_offset_get() : error conditions ***
 
 -- Testing timezone_offset_get() function with an invalid values for $object argument --
-string(87) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, object given"
+string(89) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, stdClass given"
 
 string(84) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, int given"
 
@@ -73,7 +73,7 @@ string(85) "timezone_offset_get(): Argument #1 ($object) must be of type DateTim
 
 
 -- Testing timezone_offset_get() function with an invalid values for $datetime argument --
-string(94) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, object given"
+string(96) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, stdClass given"
 
 string(91) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, int given"
 
diff --git a/ext/intl/tests/bug48227.phpt b/ext/intl/tests/bug48227.phpt
index a1e66f99e9..d44b5fc282 100644
--- a/ext/intl/tests/bug48227.phpt
+++ b/ext/intl/tests/bug48227.phpt
@@ -19,4 +19,4 @@ foreach (['', 1, NULL, $x] as $value) {
 NumberFormatter::format(): Argument #1 ($value) must be of type int|float, string given
 string(1) "1"
 string(1) "0"
-NumberFormatter::format(): Argument #1 ($value) must be of type int|float, object given
+NumberFormatter::format(): Argument #1 ($value) must be of type int|float, NumberFormatter given
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index 9da547fe5a..dbed334962 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -47,7 +47,7 @@ try {
 --EXPECT--
 error: 0, IntlCalendar::equals() expects exactly 1 parameter, 0 given
 
-error: 0, IntlCalendar::equals(): Argument #1 ($calendar) must be of type IntlCalendar, object given
+error: 0, IntlCalendar::equals(): Argument #1 ($calendar) must be of type IntlCalendar, stdClass given
 
 error: 0, IntlCalendar::equals() expects exactly 1 parameter, 2 given
 
diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt
index 93c3c497a2..e3cb4bb567 100644
--- a/ext/libxml/tests/004.phpt
+++ b/ext/libxml/tests/004.phpt
@@ -34,7 +34,7 @@ libxml_set_streams_context(): Argument #1 ($context) must be of type resource, s
 bool(true)
 libxml_set_streams_context(): Argument #1 ($context) must be of type resource, int given
 bool(true)
-libxml_set_streams_context(): Argument #1 ($context) must be of type resource, object given
+libxml_set_streams_context(): Argument #1 ($context) must be of type resource, stdClass given
 bool(true)
 libxml_set_streams_context(): Argument #1 ($context) must be of type resource, array given
 bool(true)
diff --git a/ext/mbstring/tests/mb_substitute_character_variation_strict_types.phpt b/ext/mbstring/tests/mb_substitute_character_variation_strict_types.phpt
index 3abb5c23ba..4a7455d2a1 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation_strict_types.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation_strict_types.phpt
@@ -166,9 +166,9 @@ ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must
 --heredoc--
 ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must be 'none', 'long', 'entity' or a valid codepoint
 --instance of classWithToString--
-TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, object given
+TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, classWithToString given
 --instance of classWithoutToString--
-TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, object given
+TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, classWithoutToString given
 --undefined var--
 int(12345)
 --unset var--
diff --git a/ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt b/ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt
index f9bf85a371..99b4288192 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt
@@ -167,7 +167,7 @@ ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must
 --instance of classWithToString--
 ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must be 'none', 'long', 'entity' or a valid codepoint
 --instance of classWithoutToString--
-TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, object given
+TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, classWithoutToString given
 --undefined var--
 int(0)
 --unset var--
diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index 341a08ef79..564751a25b 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -130,7 +130,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 mysqli object is not fully initialized
-[0] mysqli_result::fetch_object(): Argument #1 ($class_name) must be of type string, object given in %s on line %d
+[0] mysqli_result::fetch_object(): Argument #1 ($class_name) must be of type string, mysqli given in %s on line %d
 [0] mysqli_result::fetch_object() expects at most 2 parameters, 3 given in %s on line %d
 [0] mysqli_result::fetch_object(): Argument #2 ($params) must be of type array, null given in %s on line %d
 Exception: Too few arguments to function mysqli_fetch_object_construct::__construct(), 1 passed and exactly 2 expected
diff --git a/ext/opcache/tests/iterable_type_optimization.phpt b/ext/opcache/tests/iterable_type_optimization.phpt
index 26d9971d37..146e1544e6 100644
--- a/ext/opcache/tests/iterable_type_optimization.phpt
+++ b/ext/opcache/tests/iterable_type_optimization.phpt
@@ -10,7 +10,7 @@ test(new stdClass);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test() must be of type iterable, object returned in %s:%d
+Fatal error: Uncaught TypeError: test(): Return value must be of type iterable, stdClass returned in %s:%d
 Stack trace:
 #0 %s(%d): test(Object(stdClass))
 #1 {main}
diff --git a/ext/opcache/tests/ssa_bug_003.phpt b/ext/opcache/tests/ssa_bug_003.phpt
index b53d24d482..bcfdded45e 100644
--- a/ext/opcache/tests/ssa_bug_003.phpt
+++ b/ext/opcache/tests/ssa_bug_003.phpt
@@ -19,7 +19,7 @@ function test1($x) : callable {
 try {
     test1(1);
 } catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
+    echo $e->getMessage() . "\n";
 }
 
 class Foo {}
@@ -31,10 +31,10 @@ function test2() : Foo {
 try {
     test2();
 } catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
+    echo $e->getMessage() . "\n";
 }
 
 ?>
 --EXPECT--
-Error: Return value of test1() must be of type callable, string returned
-Error: Return value of test2() must be of type Foo, stdClass returned
+test1(): Return value must be of type callable, string returned
+test2(): Return value must be of type Foo, stdClass returned
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index b3450beff7..0d7b5e1b8b 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -66,5 +66,5 @@ array(2) {
   [2]=>
   string(4) "test"
 }
-preg_grep(): Argument #1 ($regex) must be of type string, object given
+preg_grep(): Argument #1 ($regex) must be of type string, stdClass given
 Done
diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index e052327cea..055579cb68 100644
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -80,5 +80,5 @@ array(1) {
     string(1) "t"
   }
 }
-preg_match_all(): Argument #1 ($pattern) must be of type string, object given
+preg_match_all(): Argument #1 ($pattern) must be of type string, stdClass given
 NULL
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index b4540bf5da..011ba6f97b 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -60,4 +60,4 @@ preg_match(): Argument #1 ($pattern) must be of type string, array given
 
 Arg value is /[a-zA-Z]/
 int(1)
-preg_match(): Argument #1 ($pattern) must be of type string, object given
+preg_match(): Argument #1 ($pattern) must be of type string, stdClass given
diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt
index a03bcf4417..ebc91d97fd 100644
--- a/ext/pcre/tests/preg_match_error2.phpt
+++ b/ext/pcre/tests/preg_match_error2.phpt
@@ -36,5 +36,5 @@ int(1)
 
 Arg value is: Array
 preg_match(): Argument #2 ($subject) must be of type string, array given
-preg_match(): Argument #2 ($subject) must be of type string, object given
+preg_match(): Argument #2 ($subject) must be of type string, stdClass given
 Done
diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt
index daf7852767..552b668082 100644
--- a/ext/pcre/tests/preg_split_error1.phpt
+++ b/ext/pcre/tests/preg_split_error1.phpt
@@ -67,4 +67,4 @@ array(3) {
   [2]=>
   string(4) " 5 6"
 }
-preg_split(): Argument #1 ($pattern) must be of type string, object given
+preg_split(): Argument #1 ($pattern) must be of type string, stdClass given
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
index e48d43587e..e5dce75367 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
@@ -63,4 +63,4 @@ Method 1 does not exist
 Method 1.5 does not exist
 Method 1 does not exist
 ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, array given
-ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, object given
+ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, C given
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
index 86060c8acf..61d29b89d7 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
@@ -61,4 +61,4 @@ Property 1 does not exist
 Property 1.5 does not exist
 Property 1 does not exist
 ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, array given
-ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, object given
+ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, C given
diff --git a/ext/reflection/tests/ReflectionReference_errors.phpt b/ext/reflection/tests/ReflectionReference_errors.phpt
index 88244b7940..0d1d63eb28 100644
--- a/ext/reflection/tests/ReflectionReference_errors.phpt
+++ b/ext/reflection/tests/ReflectionReference_errors.phpt
@@ -41,7 +41,7 @@ var_dump(unserialize('O:19:"ReflectionReference":0:{}'));
 ?>
 --EXPECTF--
 Call to private ReflectionReference::__construct() from invalid context
-ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, object given
+ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, stdClass given
 ReflectionReference::fromArrayElement(): Argument #2 ($key) must be of type string|int, float given
 Array key not found
 Serialization of 'ReflectionReference' is not allowed
diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt
index 6c11849956..bae8ecb625 100644
--- a/ext/session/tests/session_set_save_handler_iface_002.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_002.phpt
@@ -86,5 +86,5 @@ session_start();
 --EXPECT--
 *** Testing session_set_save_handler() function: interface wrong ***
 bool(true)
-session_set_save_handler(): Argument #1 ($open) must be of type SessionHandlerInterface, object given
+session_set_save_handler(): Argument #1 ($open) must be of type SessionHandlerInterface, MySession2 given
 good handler writing
diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index 12e632514e..ab9b430d2a 100644
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -12,4 +12,4 @@ try {
 
 ?>
 --EXPECT--
-Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object given
+Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, SplFixedArray given
diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
index 573a995cb1..f726c9d956 100644
--- a/ext/spl/tests/fixedarray_005.phpt
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -23,6 +23,6 @@ try {
 
 ?>
 --EXPECT--
-Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object given
+Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, stdClass given
 Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given
 Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given
diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt
index 21ab075cc9..38dfde3f03 100644
--- a/ext/spl/tests/iterator_044.phpt
+++ b/ext/spl/tests/iterator_044.phpt
@@ -83,8 +83,8 @@ NULL
 ===1===
 object(stdClass)#%d (0) {
 }
-CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given
-CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given
+CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, stdClass given
+CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, stdClass given
 ===2===
 object(MyFoo)#%d (0) {
 }
@@ -124,8 +124,8 @@ int(0)
 ===1===
 object(stdClass)#1 (0) {
 }
-CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given
-CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given
+CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, stdClass given
+CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, stdClass given
 ===2===
 object(MyFoo)#2 (0) {
 }
diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt
index 39a94ba8d3..80225720f2 100644
--- a/ext/spl/tests/recursive_tree_iterator_003.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_003.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-RecursiveCachingIterator::__construct(): Argument #1 ($iterator) must be of type RecursiveIterator, object given
+RecursiveCachingIterator::__construct(): Argument #1 ($iterator) must be of type RecursiveIterator, ArrayIterator given
diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index 8966c54691..95064b739a 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -172,7 +172,7 @@ array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 array_diff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_diff_assoc(): Argument #1 ($arr1) must be of type array, classA given
 
 -- Iteration 24 --
 array_diff_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index c5d5383e9d..b96db1326a 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -172,7 +172,7 @@ array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 array_diff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 -- Iteration 23 --
-array_diff_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_diff_assoc(): Argument #2 ($arr2) must be of type array, classA given
 
 -- Iteration 24 --
 array_diff_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index af334626cb..192257ae35 100644
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -192,12 +192,12 @@ array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 array_diff_key(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #1 ($arr1) must be of type array, object given
-array_diff_key(): Argument #1 ($arr1) must be of type array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_diff_key(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #1 ($arr1) must be of type array, object given
-array_diff_key(): Argument #1 ($arr1) must be of type array, object given
+array_diff_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_diff_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_key(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt
index 2dd3c95907..ec7749ebba 100644
--- a/ext/standard/tests/array/array_diff_key_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation2.phpt
@@ -193,12 +193,12 @@ array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 array_diff_key(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_key(): Argument #2 ($arr2) must be of type array, object given
-array_diff_key(): Argument #2 ($arr2) must be of type array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_diff_key(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_key(): Argument #2 ($arr2) must be of type array, object given
-array_diff_key(): Argument #2 ($arr2) must be of type array, object given
+array_diff_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_diff_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_key(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
index 368fce24db..f888f69b2b 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
@@ -179,10 +179,10 @@ array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 array_diff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_diff_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
index e906b450e5..5781f1e9bd 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
@@ -179,10 +179,10 @@ array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 array_diff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_diff_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
index 5aef21c0c3..dffb3be7c9 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
@@ -200,12 +200,12 @@ array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 array_diff_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
-array_diff_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_ukey(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
index 368e9873ca..1af7b5567d 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
@@ -204,12 +204,12 @@ array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 array_diff_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
-array_diff_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_diff_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_diff_ukey(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index 94025ec654..44734ad856 100644
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -150,7 +150,7 @@ echo "Done";
 
 -- Iteration 22 --array_diff(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #1 ($arr1) must be of type array, object given
+-- Iteration 23 --array_diff(): Argument #1 ($arr1) must be of type array, classA given
 
 -- Iteration 24 --array_diff(): Argument #1 ($arr1) must be of type array, null given
 
diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index f81f81388a..9dc1c737bd 100644
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -149,7 +149,7 @@ echo "Done";
 
 -- Iteration 22 --array_diff(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 23 --array_diff(): Argument #2 ($arr2) must be of type array, object given
+-- Iteration 23 --array_diff(): Argument #2 ($arr2) must be of type array, classA given
 
 -- Iteration 24 --array_diff(): Argument #2 ($arr2) must be of type array, null given
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
index fee88db0b0..4ef72323ca 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -179,8 +179,8 @@ array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 -- Iteration 20 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
--- Iteration 21 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, object given
+-- Iteration 21 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA given
+array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA given
 
 -- Iteration 22 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
 array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
index e79d6c86df..453d5206a5 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
@@ -180,8 +180,8 @@ array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 -- Iteration 20 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 array_intersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
--- Iteration 21 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_assoc(): Argument #2 ($arr2) must be of type array, object given
+-- Iteration 21 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, classA given
+array_intersect_assoc(): Argument #2 ($arr2) must be of type array, classA given
 
 -- Iteration 22 --array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
 array_intersect_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt
index 821e5f5a1a..62ae4b9ea4 100644
--- a/ext/standard/tests/array/array_intersect_key_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt
@@ -196,12 +196,12 @@ array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 array_intersect_key(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_key(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_intersect_key(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_key(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt
index b6c791ce57..a494f81fc6 100644
--- a/ext/standard/tests/array/array_intersect_key_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt
@@ -197,12 +197,12 @@ array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 array_intersect_key(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_key(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_intersect_key(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_key(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
index f687237732..872fe59536 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
@@ -204,12 +204,12 @@ array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string give
 array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
index 32633b6a0f..3c3781ef27 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
@@ -204,12 +204,12 @@ array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string give
 array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
index fd0b9f6038..7837bee8ec 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
@@ -202,12 +202,12 @@ array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 array_intersect_ukey(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
-array_intersect_ukey(): Argument #1 ($arr1) must be of type array, object given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_ukey(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
index dc272a7811..312066709f 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
@@ -202,12 +202,12 @@ array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 array_intersect_ukey(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
-array_intersect_ukey(): Argument #2 ($arr2) must be of type array, object given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
+array_intersect_ukey(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_intersect_ukey(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt
index 9fb64263ec..9b7f182494 100644
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -178,8 +178,8 @@ array_intersect(): Argument #1 ($arr1) must be of type array, string given
 -- Iterator 20 --array_intersect(): Argument #1 ($arr1) must be of type array, string given
 array_intersect(): Argument #1 ($arr1) must be of type array, string given
 
--- Iterator 21 --array_intersect(): Argument #1 ($arr1) must be of type array, object given
-array_intersect(): Argument #1 ($arr1) must be of type array, object given
+-- Iterator 21 --array_intersect(): Argument #1 ($arr1) must be of type array, classA given
+array_intersect(): Argument #1 ($arr1) must be of type array, classA given
 
 -- Iterator 22 --array_intersect(): Argument #1 ($arr1) must be of type array, null given
 array_intersect(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index e4986c103b..518cfeb7cc 100644
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -179,8 +179,8 @@ array_intersect(): Argument #2 ($arr2) must be of type array, string given
 -- Iterator 20 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
 array_intersect(): Argument #2 ($arr2) must be of type array, string given
 
--- Iterator 21 --array_intersect(): Argument #2 ($arr2) must be of type array, object given
-array_intersect(): Argument #2 ($arr2) must be of type array, object given
+-- Iterator 21 --array_intersect(): Argument #2 ($arr2) must be of type array, classA given
+array_intersect(): Argument #2 ($arr2) must be of type array, classA given
 
 -- Iterator 22 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
 array_intersect(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index 0024ae1867..cd68e33515 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -224,5 +224,5 @@ bool(true)
 Illegal offset type
 
 *** Testing operation on objects ***
-array_key_exists(): Argument #2 ($array) must be of type array, object given
+array_key_exists(): Argument #2 ($array) must be of type array, key_check given
 Done
diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
index 55ed56cbcc..3e33cb1480 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
@@ -210,6 +210,6 @@ echo "Done";
 -- With more arguments --array_merge_recursive(): Argument #1 must be of type array, resource given
 
 -- Iteration 24 --
--- With default argument --array_merge_recursive(): Argument #1 must be of type array, object given
--- With more arguments --array_merge_recursive(): Argument #1 must be of type array, object given
+-- With default argument --array_merge_recursive(): Argument #1 must be of type array, A given
+-- With more arguments --array_merge_recursive(): Argument #1 must be of type array, A given
 Done
diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
index ef1c52928f..da52edaf54 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
@@ -151,5 +151,5 @@ echo "Done";
 
 -- Iteration 23 --array_merge_recursive(): Argument #2 must be of type array, resource given
 
--- Iteration 24 --array_merge_recursive(): Argument #2 must be of type array, object given
+-- Iteration 24 --array_merge_recursive(): Argument #2 must be of type array, A given
 Done
diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt
index 21148cdb91..6dbf3b1128 100644
--- a/ext/standard/tests/array/array_merge_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_variation2.phpt
@@ -173,7 +173,7 @@ array_merge(): Argument #2 must be of type array, string given
 array_merge(): Argument #2 must be of type array, string given
 
 -- Iteration 22 --
-array_merge(): Argument #2 must be of type array, object given
+array_merge(): Argument #2 must be of type array, classA given
 
 -- Iteration 23 --
 array_merge(): Argument #2 must be of type array, null given
diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt
index 4ff919d8a8..bdb2973c9f 100644
--- a/ext/standard/tests/array/array_search_variation3.phpt
+++ b/ext/standard/tests/array/array_search_variation3.phpt
@@ -56,7 +56,7 @@ string(5) "three"
 int(5)
 
 *** Testing objects with array_search() ***
-array_search(): Argument #2 ($haystack) must be of type array, object given
-array_search(): Argument #2 ($haystack) must be of type array, object given
+array_search(): Argument #2 ($haystack) must be of type array, array_search_check given
+array_search(): Argument #2 ($haystack) must be of type array, array_search_check given
 int(1)
 Done
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
index dfb6ce0f64..20db93065b 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
@@ -167,10 +167,10 @@ array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 array_udiff_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_udiff_assoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
index 3a4bbda98a..f6b4065b01 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
@@ -167,10 +167,10 @@ array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 array_udiff_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_udiff_assoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
index 10180cbce1..c2a4e4fd16 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
@@ -168,10 +168,10 @@ array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
index 8540bc3d3b..c17a016a1d 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
@@ -168,10 +168,10 @@ array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt
index 35ab7f5287..7d0830a5ad 100644
--- a/ext/standard/tests/array/array_udiff_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_variation1.phpt
@@ -167,10 +167,10 @@ array_udiff(): Argument #1 ($arr1) must be of type array, string given
 array_udiff(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #1 ($arr1) must be of type array, object given
+array_udiff(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #1 ($arr1) must be of type array, object given
+array_udiff(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt
index a11bc787e4..17de2540c1 100644
--- a/ext/standard/tests/array/array_udiff_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_variation2.phpt
@@ -167,10 +167,10 @@ array_udiff(): Argument #2 ($arr2) must be of type array, string given
 array_udiff(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_udiff(): Argument #2 ($arr2) must be of type array, object given
+array_udiff(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_udiff(): Argument #2 ($arr2) must be of type array, object given
+array_udiff(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_udiff(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
index 70d8ab88c7..0c51526e01 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
@@ -167,10 +167,10 @@ array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string give
 array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect_assoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
index 6eb40634a8..01f4959145 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
@@ -167,10 +167,10 @@ array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string give
 array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect_assoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
index 15ed8461d6..d61eccd05a 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
@@ -168,10 +168,10 @@ array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string giv
 array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect_uassoc(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
index 0e7aff3d23..e6af0887da 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
@@ -168,10 +168,10 @@ array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string giv
 array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect_uassoc(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt
index 4acf4b1d56..78b1f514ae 100644
--- a/ext/standard/tests/array/array_uintersect_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation1.phpt
@@ -167,10 +167,10 @@ array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 array_uintersect(): Argument #1 ($arr1) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect(): Argument #1 ($arr1) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #1 ($arr1) must be of type array, object given
+array_uintersect(): Argument #1 ($arr1) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect(): Argument #1 ($arr1) must be of type array, null given
diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt
index ce2d311702..d9b9260779 100644
--- a/ext/standard/tests/array/array_uintersect_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation2.phpt
@@ -167,10 +167,10 @@ array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 array_uintersect(): Argument #2 ($arr2) must be of type array, string given
 
 --instance of classWithToString--
-array_uintersect(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect(): Argument #2 ($arr2) must be of type array, classWithToString given
 
 --instance of classWithoutToString--
-array_uintersect(): Argument #2 ($arr2) must be of type array, object given
+array_uintersect(): Argument #2 ($arr2) must be of type array, classWithoutToString given
 
 --undefined var--
 array_uintersect(): Argument #2 ($arr2) must be of type array, null given
diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt
index 9ad8f7e280..2cfa6279cc 100644
--- a/ext/standard/tests/array/bug40191.phpt
+++ b/ext/standard/tests/array/bug40191.phpt
@@ -17,5 +17,5 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-array_unique(): Argument #1 ($arg) must be of type array, object given
+array_unique(): Argument #1 ($arg) must be of type array, ArrayObject given
 Done
diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt
index 2e6bd0330e..e495b11b71 100644
--- a/ext/standard/tests/array/in_array_variation3.phpt
+++ b/ext/standard/tests/array/in_array_variation3.phpt
@@ -59,7 +59,7 @@ bool(true)
 bool(true)
 
 *** Testing objects with in_array() ***
-in_array(): Argument #2 ($haystack) must be of type array, object given
-in_array(): Argument #2 ($haystack) must be of type array, object given
+in_array(): Argument #2 ($haystack) must be of type array, in_array_check given
+in_array(): Argument #2 ($haystack) must be of type array, in_array_check given
 bool(true)
 Done
diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt
index d1e6dc269a..4360b91525 100644
--- a/ext/standard/tests/array/max.phpt
+++ b/ext/standard/tests/array/max.phpt
@@ -35,7 +35,7 @@ var_dump(max(0, true, false, true));
 --EXPECT--
 max(): Argument #1 ($arg) must be of type array, int given
 max(): Argument #1 ($arg) must contain at least one element
-max(): Argument #1 ($arg) must be of type array, object given
+max(): Argument #1 ($arg) must be of type array, stdClass given
 int(2)
 float(2.11)
 string(1) "t"
diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt
index eac37be7dd..ad32ae4226 100644
--- a/ext/standard/tests/array/min.phpt
+++ b/ext/standard/tests/array/min.phpt
@@ -35,7 +35,7 @@ var_dump(min(0, true, false, true));
 --EXPECT--
 min(): Argument #1 ($arg) must be of type array, int given
 min(): Argument #1 ($arg) must contain at least one element
-min(): Argument #1 ($arg) must be of type array, object given
+min(): Argument #1 ($arg) must be of type array, stdClass given
 int(1)
 float(2.09)
 string(0) ""
diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt
index f6ebeba2ef..9541c08bc2 100644
--- a/ext/standard/tests/math/abs_variation.phpt
+++ b/ext/standard/tests/math/abs_variation.phpt
@@ -123,7 +123,7 @@ abs(): Argument #1 ($number) must be of type int|float, string given
 abs(): Argument #1 ($number) must be of type int|float, string given
 
 -- Iteration 13 --
-abs(): Argument #1 ($number) must be of type int|float, object given
+abs(): Argument #1 ($number) must be of type int|float, classA given
 
 -- Iteration 14 --
 int(0)
diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt
index 4140738e02..2a494ebcdf 100644
--- a/ext/standard/tests/math/ceil_variation1.phpt
+++ b/ext/standard/tests/math/ceil_variation1.phpt
@@ -116,7 +116,7 @@ ceil(): Argument #1 ($number) must be of type int|float, string given
 ceil(): Argument #1 ($number) must be of type int|float, string given
 
 -- Iteration 13 --
-ceil(): Argument #1 ($number) must be of type int|float, object given
+ceil(): Argument #1 ($number) must be of type int|float, classA given
 
 -- Iteration 14 --
 float(0)
diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt
index f5b3e98461..1679d23989 100644
--- a/ext/standard/tests/math/floor_variation1.phpt
+++ b/ext/standard/tests/math/floor_variation1.phpt
@@ -116,7 +116,7 @@ floor(): Argument #1 ($number) must be of type int|float, string given
 floor(): Argument #1 ($number) must be of type int|float, string given
 
 -- Iteration 13 --
-floor(): Argument #1 ($number) must be of type int|float, object given
+floor(): Argument #1 ($number) must be of type int|float, classA given
 
 -- Iteration 14 --
 float(0)
diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt
index f205c18a83..f7e5a5c9e2 100644
--- a/ext/standard/tests/math/pow_variation1.phpt
+++ b/ext/standard/tests/math/pow_variation1.phpt
@@ -174,7 +174,7 @@ Warning: A non-numeric value encountered in %s on line %d
 int(0)
 
 -- Iteration 23 --
-Unsupported operand types: object ** int
+Unsupported operand types: classA ** int
 
 -- Iteration 24 --
 int(0)
diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt
index 05cb9151ae..1743cf206a 100644
--- a/ext/standard/tests/math/pow_variation1_64bit.phpt
+++ b/ext/standard/tests/math/pow_variation1_64bit.phpt
@@ -174,7 +174,7 @@ Warning: A non-numeric value encountered in %s on line %d
 int(0)
 
 -- Iteration 23 --
-Unsupported operand types: object ** int
+Unsupported operand types: classA ** int
 
 -- Iteration 24 --
 int(0)
diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt
index 5d106ed9d2..e120abebe4 100644
--- a/ext/standard/tests/math/pow_variation2.phpt
+++ b/ext/standard/tests/math/pow_variation2.phpt
@@ -170,7 +170,7 @@ Warning: A non-numeric value encountered in %s on line %d
 float(1)
 
 -- Iteration 23 --
-Unsupported operand types: float ** object
+Unsupported operand types: float ** classA
 
 -- Iteration 24 --
 float(1)
diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt
index 5371d0fb94..43ad4deae7 100644
--- a/ext/standard/tests/math/round_variation1.phpt
+++ b/ext/standard/tests/math/round_variation1.phpt
@@ -161,7 +161,7 @@ round(): Argument #1 ($number) must be of type int|float, string given
 round(): Argument #1 ($number) must be of type int|float, string given
 
 -- Iteration 23 --
-round(): Argument #1 ($number) must be of type int|float, object given
+round(): Argument #1 ($number) must be of type int|float, classA given
 
 -- Iteration 24 --
 float(0)
diff --git a/ext/standard/tests/network/bug73594.phpt b/ext/standard/tests/network/bug73594.phpt
index 370b6162fd..79607cacec 100644
--- a/ext/standard/tests/network/bug73594.phpt
+++ b/ext/standard/tests/network/bug73594.phpt
@@ -24,4 +24,4 @@ $res = dns_get_record('php.net', DNS_MX, $auth, $additional);
 var_dump(!empty($res) && empty($additional));
 ?>
 --EXPECT--
-bool(false)
+bool(true)
diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt
index 3def367df0..0dc056ea34 100644
--- a/ext/standard/tests/password/password_hash_error.phpt
+++ b/ext/standard/tests/password/password_hash_error.phpt
@@ -40,6 +40,6 @@ password_hash() expects at least 2 parameters, 1 given
 
 Warning: Array to string conversion in %s on line %d
 password_hash(): Argument #2 ($algo) must be a valid password hashing algorithm
-password_hash(): Argument #3 ($options) must be of type array, object given
+password_hash(): Argument #3 ($options) must be of type array, stdClass given
 password_hash(): Argument #3 ($options) must be of type array, string given
 password_hash(): Argument #1 ($password) must be of type string, array given
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index 37d9b64e1d..169b912cd9 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -138,7 +138,7 @@ join(): Argument #2 ($pieces) must be of type array, string given
 -- Iteration 15 --
 join(): Argument #2 ($pieces) must be of type array, string given
 -- Iteration 16 --
-join(): Argument #2 ($pieces) must be of type array, object given
+join(): Argument #2 ($pieces) must be of type array, test given
 -- Iteration 17 --
 join(): Argument #2 ($pieces) must be of type array, string given
 -- Iteration 18 --
diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt
index 30892395fe..40b526f1e3 100644
--- a/ext/standard/tests/strings/vprintf_variation2.phpt
+++ b/ext/standard/tests/strings/vprintf_variation2.phpt
@@ -161,7 +161,7 @@ vprintf(): Argument #2 ($args) must be of type array, string given
 vprintf(): Argument #2 ($args) must be of type array, string given
 
 -- Iteration 20 --
-vprintf(): Argument #2 ($args) must be of type array, object given
+vprintf(): Argument #2 ($args) must be of type array, sample given
 
 -- Iteration 21 --
 vprintf(): Argument #2 ($args) must be of type array, null given