Improve type error messages when an object is given

kocsismate · kocsismate · commit aff4ce283a3e · 2020-05-26T11:45:10.000+02:00
Additionally, make the format of return type errors match the format of argument errors.
diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt
@@ -64,6 +64,6 @@ try {
 --EXPECT--
 Hello World!
 ===NONE===
-Return value of NoneTest::__toString() must be of type string, none returned
+NoneTest::__toString(): Return value must be of type string, none returned
 ===THROW===
 This is an error!
diff --git a/Zend/tests/ns_071.phpt b/Zend/tests/ns_071.phpt
@@ -18,7 +18,7 @@ new bar(new \stdclass);
 --EXPECTF--
 NULL
 
-Fatal error: Uncaught TypeError: foo\bar::__construct(): Argument #1 ($x) must be of type ?array, object given, called in %s:%d
+Fatal error: Uncaught TypeError: foo\bar::__construct(): Argument #1 ($x) must be of type ?array, stdClass given, called in %s:%d
 Stack trace:
 #0 %s(%d): foo\bar->__construct(Object(stdClass))
 #1 {main}
diff --git a/Zend/tests/object_types/return_type_in_class.phpt b/Zend/tests/object_types/return_type_in_class.phpt
@@ -18,7 +18,7 @@ $three = new class extends Two {
 };
 $three->a();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of Two@anonymous::a() must be of type object, int returned in %s:%d
+Fatal error: Uncaught TypeError: Two@anonymous::a(): Return value must be of type object, int returned in %s:%d
 Stack trace:
 #0 %s(%d): Two@anonymous->a()
 #1 {main}
diff --git a/Zend/tests/object_types/return_type_in_function.phpt b/Zend/tests/object_types/return_type_in_function.phpt
@@ -8,7 +8,7 @@ function a() : object {
 }
 a();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of a() must be of type object, int returned in %s:4
+Fatal error: Uncaught TypeError: a(): Return value must be of type object, int returned in %s:%d
 Stack trace:
 #0 %s(6): a()
 #1 {main}
diff --git a/Zend/tests/object_types/return_type_inheritance_in_class.phpt b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
@@ -18,7 +18,7 @@ $three = new class extends Two {
 };
 $three->a();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of Two@anonymous::a() must be of type object, int returned in %s:%d
+Fatal error: Uncaught TypeError: Two@anonymous::a(): Return value must be of type object, int returned in %s:%d
 Stack trace:
 #0 %s(%d): Two@anonymous->a()
 #1 {main}
diff --git a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
@@ -18,7 +18,7 @@ $three = new class implements Two {
 };
 $three->a();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of Two@anonymous::a() must be of type object, int returned in %s:%d
+Fatal error: Uncaught TypeError: Two@anonymous::a(): Return value must be of type object, int returned in %s:%d
 Stack trace:
 #0 %s(%d): Two@anonymous->a()
 #1 {main}
diff --git a/Zend/tests/return_types/001.phpt b/Zend/tests/return_types/001.phpt
@@ -7,7 +7,7 @@ function test1() : array {
 
 test1();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of type array, none returned in %s:%d
+Fatal error: Uncaught TypeError: test1(): Return value must be of type array, none returned in %s:%d
 Stack trace:
 #0 %s(%d): test1()
 #1 {main}
diff --git a/Zend/tests/return_types/002.phpt b/Zend/tests/return_types/002.phpt
@@ -8,7 +8,7 @@ function test1() : array {
 
 test1();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of type array, null returned in %s:%d
+Fatal error: Uncaught TypeError: test1(): Return value must be of type array, null returned in %s:%d
 Stack trace:
 #0 %s(%d): test1()
 #1 {main}
diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt
@@ -7,7 +7,7 @@ function test1() : array {
 }
 test1();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of type array, int returned in %s:%d
+Fatal error: Uncaught TypeError: test1(): Return value must be of type array, int returned in %s:%d
 Stack trace:
 #0 %s(%d): test1()
 #1 {main}
diff --git a/Zend/tests/return_types/004.phpt b/Zend/tests/return_types/004.phpt
@@ -8,7 +8,7 @@ function test1() : array {
 
 test1();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of type array, string returned in %s:%d
+Fatal error: Uncaught TypeError: test1(): Return value must be of type array, string returned in %s:%d
 Stack trace:
 #0 %s(%d): test1()
 #1 {main}
diff --git a/Zend/tests/return_types/005.phpt b/Zend/tests/return_types/005.phpt
@@ -13,7 +13,7 @@ class qux {
 $qux = new qux();
 $qux->foo();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of qux::foo() must be of type foo, qux returned in %s:%d
+Fatal error: Uncaught TypeError: qux::foo(): Return value must be of type foo, qux returned in %s:%d
 Stack trace:
 #0 %s(%d): qux->foo()
 #1 {main}
diff --git a/Zend/tests/return_types/010.phpt b/Zend/tests/return_types/010.phpt
@@ -9,7 +9,7 @@ function &foo(array &$in) : array {
 $array = [1, 2, 3];
 var_dump(foo($array));
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of foo() must be of type array, null returned in %s:%d
+Fatal error: Uncaught TypeError: foo(): Return value must be of type array, null returned in %s:%d
 Stack trace:
 #0 %s(%d): foo(Array)
 #1 {main}
diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt
@@ -14,7 +14,7 @@ class foo {
 $baz = new foo();
 var_dump($func=$baz->bar(), $func());
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of foo::{closure}() must be of type array, null returned in %s:%d
+Fatal error: Uncaught TypeError: foo::{closure}(): Return value must be of type array, null returned in %s:%d
 Stack trace:
 #0 %s(%d): foo->{closure}()
 #1 {main}
diff --git a/Zend/tests/return_types/028.phpt b/Zend/tests/return_types/028.phpt
@@ -17,4 +17,4 @@ try {
 
 ?>
 --EXPECTF--
-Return value of foo() must be of type stdClass, array returned in %s on line %d
+foo(): Return value must be of type stdClass, array returned in %s on line %d
diff --git a/Zend/tests/return_types/029.phpt b/Zend/tests/return_types/029.phpt
@@ -21,7 +21,7 @@ Stack trace:
 #0 %s(%d): foo()
 #1 {main}
 
-Next TypeError: Return value of foo() must be of type array, null returned in %s29.php:%d
+Next TypeError: foo(): Return value must be of type array, null returned in %s:%d
 Stack trace:
 #0 %s(%d): foo()
 #1 {main}
diff --git a/Zend/tests/return_types/030.phpt b/Zend/tests/return_types/030.phpt
@@ -16,7 +16,7 @@ foo(0);
 ok
 ok
 
-Fatal error: Uncaught TypeError: Return value of foo() must be of type ?array, int returned in %s030.php:3
+Fatal error: Uncaught TypeError: foo(): Return value must be of type ?array, int returned in %s:%d
 Stack trace:
 #0 %s030.php(10): foo(0)
 #1 {main}
diff --git a/Zend/tests/return_types/bug70557.phpt b/Zend/tests/return_types/bug70557.phpt
@@ -16,4 +16,4 @@ try {
 }
 ?>
 --EXPECT--
-string(64) "Return value of getNumber() must be of type int, string returned"
+string(62) "getNumber(): Return value must be of type int, string returned"
diff --git a/Zend/tests/return_types/bug71092.phpt b/Zend/tests/return_types/bug71092.phpt
@@ -16,7 +16,7 @@ function boom(): array {
 boom();
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of boom() must be of type array, null returned in %sbug71092.php:%d
+Fatal error: Uncaught TypeError: boom(): Return value must be of type array, null returned in %s:%d
 Stack trace:
 #0 %s(%d): boom()
 #1 {main}
diff --git a/Zend/tests/return_types/internal_functions001.phpt b/Zend/tests/return_types/internal_functions001.phpt
@@ -10,5 +10,5 @@ if (!PHP_DEBUG) die('skip requires debug build');
 <?php
 zend_test_array_return();
 ?>
---EXPECTF--
-Fatal error: Return value of zend_test_array_return() must be of type array, null returned in %s on line %d
+--EXPECT--
+Fatal error: zend_test_array_return(): Return value must be of type array, null returned in Unknown on line 0
diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt
@@ -9,7 +9,7 @@ function get_config(): array {
 
 get_config();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of get_config() must be of type array, int returned in %s:%d
+Fatal error: Uncaught TypeError: get_config(): Return value must be of type array, int returned in %s:%d
 Stack trace:
 #0 %s(%d): get_config()
 #1 {main}
diff --git a/Zend/tests/return_types/rfc003.phpt b/Zend/tests/return_types/rfc003.phpt
@@ -8,7 +8,7 @@ function foo(): DateTime {
 
 foo();
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of foo() must be of type DateTime, null returned in %s:%d
+Fatal error: Uncaught TypeError: foo(): Return value must be of type DateTime, null returned in %s:%d
 Stack trace:
 #0 %s(%d): foo()
 #1 {main}
diff --git a/Zend/tests/trait_type_errors.phpt b/Zend/tests/trait_type_errors.phpt
@@ -38,6 +38,6 @@ try {
 
 ?>
 --EXPECTF--
-Return value of C::test1() must be of type int, string returned
+C::test1(): Return value must be of type int, string returned
 C::test2(): Argument #1 ($arg) must be of type int, string given, called in %s on line %d
 C::test3(): Argument #1 ($arg) must be of type int, string given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/iterable_003.phpt b/Zend/tests/type_declarations/iterable_003.phpt
@@ -29,4 +29,4 @@ array(0) {
 }
 object(Generator)#2 (0) {
 }
-Return value of baz() must be of type iterable, int returned
+baz(): Return value must be of type iterable, int returned
diff --git a/Zend/tests/type_declarations/mixed/validation/mixed_return_strict_error.phpt b/Zend/tests/type_declarations/mixed/validation/mixed_return_strict_error.phpt
@@ -15,6 +15,5 @@ try {
 }
 
 ?>
---EXPECTF--
-Return value of foo() must be of type mixed, none returned
-
+--EXPECT--
+foo(): Return value must be of type mixed, none returned
diff --git a/Zend/tests/type_declarations/mixed/validation/mixed_return_weak_error.phpt b/Zend/tests/type_declarations/mixed/validation/mixed_return_weak_error.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECT--
-Return value of foo() must be of type mixed, none returned
+foo(): Return value must be of type mixed, none returned
diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt
@@ -104,11 +104,11 @@ int(0)
 
 *** Trying object(stdClass)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($i) must be of type int, stdClass given, called in %s on line %d
 
 *** Trying object(StringCapable)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($i) must be of type int, StringCapable given, called in %s on line %d
 
 *** Trying resource(%d) of type (stream)
 *** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d
@@ -158,11 +158,11 @@ float(0)
 
 *** Trying object(stdClass)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($f) must be of type float, stdClass given, called in %s on line %d
 
 *** Trying object(StringCapable)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($f) must be of type float, StringCapable given, called in %s on line %d
 
 *** Trying resource(%d) of type (stream)
 *** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d
@@ -211,7 +211,7 @@ string(0) ""
 
 *** Trying object(stdClass)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($s) must be of type string, stdClass given, called in %s on line %d
 
 *** Trying object(StringCapable)#%s (0) {
 }
@@ -264,11 +264,11 @@ bool(false)
 
 *** Trying object(stdClass)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($b) must be of type bool, stdClass given, called in %s on line %d
 
 *** Trying object(StringCapable)#%s (0) {
 }
-*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d
+*** Caught {closure}(): Argument #1 ($b) must be of type bool, StringCapable given, called in %s on line %d
 
 *** Trying resource(%d) of type (stream)
 *** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_return_basic.phpt b/Zend/tests/type_declarations/scalar_return_basic.phpt
@@ -75,30 +75,30 @@ int(1)
 E_NOTICE: A non well formed numeric value encountered on line %d
 int(1)
 *** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of type int, string returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d
 *** Trying string(0) ""
-*** Caught Return value of {closure}() must be of type int, string returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d
 *** Trying int(2147483647)
 int(2147483647)
 *** Trying float(NAN)
-*** Caught Return value of {closure}() must be of type int, float returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, float returned in %s on line %d
 *** Trying bool(true)
 int(1)
 *** Trying bool(false)
 int(0)
 *** Trying NULL
-*** Caught Return value of {closure}() must be of type int, null returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of type int, array returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of type int, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, object returned in %s on line %d
 *** Trying object(StringCapable)#7 (0) {
 }
-*** Caught Return value of {closure}() must be of type int, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, object returned in %s on line %d
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of type int, resource returned in %s on line %d
+*** Caught {closure}(): Return value must be of type int, resource returned in %s on line %d
 
 Testing 'float' type:
 *** Trying int(1)
@@ -113,9 +113,9 @@ float(1.5)
 E_NOTICE: A non well formed numeric value encountered on line %d
 float(1)
 *** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of type float, string returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d
 *** Trying string(0) ""
-*** Caught Return value of {closure}() must be of type float, string returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d
 *** Trying int(2147483647)
 float(2147483647)
 *** Trying float(NAN)
@@ -125,18 +125,18 @@ float(1)
 *** Trying bool(false)
 float(0)
 *** Trying NULL
-*** Caught Return value of {closure}() must be of type float, null returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of type float, array returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of type float, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, object returned in %s on line %d
 *** Trying object(StringCapable)#7 (0) {
 }
-*** Caught Return value of {closure}() must be of type float, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, object returned in %s on line %d
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of type float, resource returned in %s on line %d
+*** Caught {closure}(): Return value must be of type float, resource returned in %s on line %d
 
 Testing 'string' type:
 *** Trying int(1)
@@ -162,18 +162,18 @@ string(1) "1"
 *** Trying bool(false)
 string(0) ""
 *** Trying NULL
-*** Caught Return value of {closure}() must be of type string, null returned in %s on line %d
+*** Caught {closure}(): Return value must be of type string, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of type string, array returned in %s on line %d
+*** Caught {closure}(): Return value must be of type string, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of type string, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type string, object returned in %s on line %d
 *** Trying object(StringCapable)#7 (0) {
 }
 string(6) "foobar"
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of type string, resource returned in %s on line %d
+*** Caught {closure}(): Return value must be of type string, resource returned in %s on line %d
 
 Testing 'bool' type:
 *** Trying int(1)
@@ -199,17 +199,17 @@ bool(true)
 *** Trying bool(false)
 bool(false)
 *** Trying NULL
-*** Caught Return value of {closure}() must be of type bool, null returned in %s on line %d
+*** Caught {closure}(): Return value must be of type bool, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of type bool, array returned in %s on line %d
+*** Caught {closure}(): Return value must be of type bool, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of type bool, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type bool, object returned in %s on line %d
 *** Trying object(StringCapable)#7 (0) {
 }
-*** Caught Return value of {closure}() must be of type bool, object returned in %s on line %d
+*** Caught {closure}(): Return value must be of type bool, object returned in %s on line %d
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of type bool, resource returned in %s on line %d
+*** Caught {closure}(): Return value must be of type bool, resource returned in %s on line %d
 
 Done
diff --git a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
diff --git a/Zend/tests/type_declarations/scalar_strict_64bit.phpt b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
diff --git a/Zend/tests/type_declarations/scalar_strict_basic.phpt b/Zend/tests/type_declarations/scalar_strict_basic.phpt
diff --git a/Zend/tests/type_declarations/static_type_return.phpt b/Zend/tests/type_declarations/static_type_return.phpt
diff --git a/Zend/tests/type_declarations/static_type_trait.phpt b/Zend/tests/type_declarations/static_type_trait.phpt
diff --git a/Zend/tests/type_declarations/union_types/type_checking_strict.phpt b/Zend/tests/type_declarations/union_types/type_checking_strict.phpt
diff --git a/Zend/tests/type_declarations/union_types/type_checking_weak.phpt b/Zend/tests/type_declarations/union_types/type_checking_weak.phpt
diff --git a/Zend/tests/typehints/or_null.phpt b/Zend/tests/typehints/or_null.phpt
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
diff --git a/ext/opcache/tests/iterable_type_optimization.phpt b/ext/opcache/tests/iterable_type_optimization.phpt
diff --git a/ext/opcache/tests/ssa_bug_003.phpt b/ext/opcache/tests/ssa_bug_003.phpt
diff --git a/tests/classes/tostring_001.phpt b/tests/classes/tostring_001.phpt
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function a() : object {`
`8`	`8`	`}`
`9`	`9`	`a();`
`10`	`10`	`--EXPECTF--`
`11`		`-Fatal error: Uncaught TypeError: Return value of a() must be of type object, int returned in %s:4`
	`11`	`+Fatal error: Uncaught TypeError: a(): Return value must be of type object, int returned in %s:%d`
`12`	`12`	`Stack trace:`
`13`	`13`	`#0 %s(6): a()`
`14`	`14`	`#1 {main}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function test1() : array {`
`7`	`7`	`}`
`8`	`8`	`test1();`
`9`	`9`	`--EXPECTF--`
`10`		`-Fatal error: Uncaught TypeError: Return value of test1() must be of type array, int returned in %s:%d`
	`10`	`+Fatal error: Uncaught TypeError: test1(): Return value must be of type array, int returned in %s:%d`
`11`	`11`	`Stack trace:`
`12`	`12`	`#0 %s(%d): test1()`
`13`	`13`	`#1 {main}`