diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-02-25 20:58:33 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-02-26 15:00:08 +0100 |
| commit | 960318ed95d17bd30c2896e2f3189ebffb965dce (patch) | |
| tree | 2890972c266dabe649a44b540869a49e41a3e450 | |
| parent | c7094d892639fedffb67c273f8fd44f3ffff86d6 (diff) | |
| download | php-git-960318ed95d17bd30c2896e2f3189ebffb965dce.tar.gz | |
Change argument error message format
Closes GH-5211
357 files changed, 1168 insertions, 1158 deletions
diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt index f597812fa8..b53578dbb3 100644 --- a/Zend/tests/008.phpt +++ b/Zend/tests/008.phpt @@ -25,7 +25,7 @@ var_dump(constant("test const")); echo "Done\n"; ?> --EXPECTF-- -TypeError: define() expects argument #1 ($constant_name) to be of type string, array given +TypeError: define(): Argument #1 ($constant_name) must be of type string, array given Notice: Constant TRUE already defined in %s on line %d bool(false) diff --git a/Zend/tests/009.phpt b/Zend/tests/009.phpt index 222fd36297..16c060389d 100644 --- a/Zend/tests/009.phpt +++ b/Zend/tests/009.phpt @@ -46,8 +46,8 @@ string(3) "foo" Warning: get_class() called without object from outside a class in %s on line %d bool(false) -get_class() expects argument #1 ($object) to be of type object, string given +get_class(): Argument #1 ($object) must be of type object, string given string(3) "foo" string(4) "foo2" -get_class() expects argument #1 ($object) to be of type object, null given +get_class(): Argument #1 ($object) must be of type object, null given Done diff --git a/Zend/tests/arrow_functions/006.phpt b/Zend/tests/arrow_functions/006.phpt index e0ca1e1b5c..6bf4c683c8 100644 --- a/Zend/tests/arrow_functions/006.phpt +++ b/Zend/tests/arrow_functions/006.phpt @@ -32,7 +32,7 @@ try { --EXPECTF-- int(2) int(10) -{closure}() expects argument #1 ($x) to be of type int, string given, called in %s on line %d +{closure}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d array(3) { [0]=> int(20) @@ -41,4 +41,4 @@ array(3) { [2]=> int(30) } -{closure}() expects argument #2 ($args) to be of type ?int, string given, called in %s on line %d +{closure}(): Argument #2 ($args) must be of type ?int, string given, called in %s on line %d diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt index ea4ba7753c..fb3992ecee 100644 --- a/Zend/tests/bug31720.phpt +++ b/Zend/tests/bug31720.phpt @@ -12,4 +12,4 @@ try { ?> --EXPECTF-- Warning: Undefined variable: nonesuchvar in %s on line %d -array_walk() expects argument #2 ($funcname) to be a valid callback, first array member is not a valid class name or object +array_walk(): Argument #2 ($funcname) must be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt index 758e3f9c83..5f7c784976 100644 --- a/Zend/tests/bug39003.phpt +++ b/Zend/tests/bug39003.phpt @@ -20,7 +20,7 @@ test($obj); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: test() expects argument #1 ($object) to be of type OtherClassName, ClassName given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: test(): Argument #1 ($object) must be of type OtherClassName, ClassName given, called in %s:%d Stack trace: #0 %s(%d): test(Object(ClassName)) #1 {main} diff --git a/Zend/tests/bug42802.phpt b/Zend/tests/bug42802.phpt index 084b7c0e9d..375d7f6b5b 100644 --- a/Zend/tests/bug42802.phpt +++ b/Zend/tests/bug42802.phpt @@ -37,7 +37,7 @@ ok ok ok -Fatal error: Uncaught TypeError: foo\test5() expects argument #1 ($bar) to be of type bar, foo\bar given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo\test5(): Argument #1 ($bar) must be of type bar, foo\bar given, called in %s:%d Stack trace: #0 %s(%d): foo\test5(Object(foo\bar)) #1 {main} diff --git a/Zend/tests/bug43332_1.phpt b/Zend/tests/bug43332_1.phpt index e7f52eae9c..3b999646b5 100644 --- a/Zend/tests/bug43332_1.phpt +++ b/Zend/tests/bug43332_1.phpt @@ -12,7 +12,7 @@ $foo = new foo; $foo->bar($foo); // Ok! $foo->bar(new \stdclass); // Error, ok! --EXPECTF-- -Fatal error: Uncaught TypeError: foobar\foo::bar() expects argument #1 ($a) to be of type foobar\foo, stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php:5 +Fatal error: Uncaught TypeError: foobar\foo::bar(): Argument #1 ($a) must be of type foobar\foo, stdClass given, called in %s:%d Stack trace: #0 %s(%d): foobar\foo->bar(Object(stdClass)) #1 {main} diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt index d60cab5088..7e4d0e5a73 100644 --- a/Zend/tests/bug45186.phpt +++ b/Zend/tests/bug45186.phpt @@ -54,4 +54,4 @@ string(1) "y" ok __callstatic: string(3) "www" -call_user_func() expects argument #1 ($function) to be a valid callback, cannot access self:: when no class scope is active +call_user_func(): Argument #1 ($function) must be a valid callback, cannot access self:: when no class scope is active diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/bug45186_2.phpt index 262b379180..01f5734a4f 100644 --- a/Zend/tests/bug45186_2.phpt +++ b/Zend/tests/bug45186_2.phpt @@ -52,5 +52,5 @@ string(1) "y" __call: string(1) "y" ok -call_user_func() expects argument #1 ($function) to be a valid callback, class 'bar' does not have a method 'www' -call_user_func() expects argument #1 ($function) to be a valid callback, cannot access self:: when no class scope is active +call_user_func(): Argument #1 ($function) must be a valid callback, class 'bar' does not have a method 'www' +call_user_func(): Argument #1 ($function) must be a valid callback, cannot access self:: when no class scope is active diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt index c5c17acb83..b8f88445f8 100644 --- a/Zend/tests/bug48770_2.phpt +++ b/Zend/tests/bug48770_2.phpt @@ -58,5 +58,5 @@ $c->func('This should work!'); --EXPECT-- string(27) "A::func2: This should work!" string(27) "A::func3: This should work!" -call_user_func_array() expects argument #1 ($function) to be a valid callback, cannot access private method A::func22() -call_user_func_array() expects argument #1 ($function) to be a valid callback, class 'A' does not have a method 'inexistent' +call_user_func_array(): Argument #1 ($function) must be a valid callback, cannot access private method A::func22() +call_user_func_array(): Argument #1 ($function) must be a valid callback, class 'A' does not have a method 'inexistent' diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt index 07cc8025df..0ce0d69119 100644 --- a/Zend/tests/bug48770_3.phpt +++ b/Zend/tests/bug48770_3.phpt @@ -52,4 +52,4 @@ $c->func('This should work!'); --EXPECT-- string(27) "B::func2: This should work!" string(27) "B::func3: This should work!" -call_user_func_array() expects argument #1 ($function) to be a valid callback, class 'B' does not have a method 'inexistent' +call_user_func_array(): Argument #1 ($function) must be a valid callback, class 'B' does not have a method 'inexistent' diff --git a/Zend/tests/bug61273.phpt b/Zend/tests/bug61273.phpt index e9d67f9d2a..45461729cb 100644 --- a/Zend/tests/bug61273.phpt +++ b/Zend/tests/bug61273.phpt @@ -11,5 +11,5 @@ $args = array_fill(0, 64 * 1024 - 64, 0); call_user_func_array(function(&$a) {}, $args); echo strval("okey"); --EXPECTF-- -Warning: {closure}() expects argument #1 ($a) to be passed by reference, value given in %s on line %d +Warning: {closure}(): Argument #1 ($a) must be passed by reference, value given in %s on line %d okey diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt index c9d833a37f..34cdb23149 100644 --- a/Zend/tests/bug68446.phpt +++ b/Zend/tests/bug68446.phpt @@ -32,7 +32,7 @@ array(1) { int(1) } -Fatal error: Uncaught TypeError: a() expects argument #1 ($a) to be of type array, null given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: a(): Argument #1 ($a) must be of type array, null given, called in %s:%d Stack trace: #0 %s(%d): a(NULL) #1 {main} diff --git a/Zend/tests/bug70895.phpt b/Zend/tests/bug70895.phpt index 0d4dc47004..9aa3706362 100644 --- a/Zend/tests/bug70895.phpt +++ b/Zend/tests/bug70895.phpt @@ -20,6 +20,6 @@ try { } ?> --EXPECT-- -array_map() expects argument #1 ($callback) to be a valid callback, function '%n' not found or invalid function name -array_map() expects argument #1 ($callback) to be a valid callback, function '%n %i' not found or invalid function name -array_map() expects argument #1 ($callback) to be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '%n' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '%n %i' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name diff --git a/Zend/tests/bug70898.phpt b/Zend/tests/bug70898.phpt index 2a0fabd138..ea67acaaf8 100644 --- a/Zend/tests/bug70898.phpt +++ b/Zend/tests/bug70898.phpt @@ -13,4 +13,4 @@ try { } ?> --EXPECT-- -array_map() expects argument #1 ($callback) to be a valid callback, function '0000000000000000000000000000000000' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '0000000000000000000000000000000000' not found or invalid function name diff --git a/Zend/tests/bug72598.phpt b/Zend/tests/bug72598.phpt index acf40cbba0..741abc35e2 100644 --- a/Zend/tests/bug72598.phpt +++ b/Zend/tests/bug72598.phpt @@ -17,10 +17,10 @@ new class { }; ?> --EXPECTF-- -Warning: ref() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: ref(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d object(class@anonymous)#1 (0) { } -Warning: ref() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: ref(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d object(class@anonymous)#1 (0) { } diff --git a/Zend/tests/bug72598_2.phpt b/Zend/tests/bug72598_2.phpt index 75c4894dff..9a9274aae4 100644 --- a/Zend/tests/bug72598_2.phpt +++ b/Zend/tests/bug72598_2.phpt @@ -20,8 +20,8 @@ new class { }; ?> --EXPECTF-- -Warning: ref() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: ref(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d int(0) -Warning: ref() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: ref(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d int(0) diff --git a/Zend/tests/bug73954.phpt b/Zend/tests/bug73954.phpt index 062d438b60..bff81f5001 100644 --- a/Zend/tests/bug73954.phpt +++ b/Zend/tests/bug73954.phpt @@ -16,7 +16,7 @@ takes_int(log(tan(3.14))); float(NAN) bool(true) -Fatal error: Uncaught TypeError: takes_int() expects argument #1 ($int) to be of type int, float given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: takes_int(): Argument #1 ($int) must be of type int, float given, called in %s:%d Stack trace: #0 %s(9): takes_int(NAN) #1 {main} diff --git a/Zend/tests/bug74164.phpt b/Zend/tests/bug74164.phpt index e0dbed9a19..36d681290d 100644 --- a/Zend/tests/bug74164.phpt +++ b/Zend/tests/bug74164.phpt @@ -12,7 +12,7 @@ set_error_handler(function ($type, $msg) { call_user_func(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable'); ?> --EXPECTF-- -Fatal error: Uncaught Exception: Foo\{closure}() expects argument #1 ($ref) to be passed by reference, value given in %s:%d +Fatal error: Uncaught Exception: Foo\{closure}(): Argument #1 ($ref) must be passed by reference, value given in %s:%d Stack trace: #0 [internal function]: Foo\{closure}(%s) #1 %sbug74164.php(%d): call_user_func(%s) diff --git a/Zend/tests/call_user_func_001.phpt b/Zend/tests/call_user_func_001.phpt index 8ad7656459..34234271b3 100644 --- a/Zend/tests/call_user_func_001.phpt +++ b/Zend/tests/call_user_func_001.phpt @@ -37,5 +37,5 @@ namespace testing { ?> --EXPECT-- string(6) "foobar" -call_user_func() expects argument #1 ($function) to be a valid callback, cannot access private method testing\foo::priv() -call_user_func() expects argument #1 ($function) to be a valid callback, cannot access protected method testing\foo::prot() +call_user_func(): Argument #1 ($function) must be a valid callback, cannot access private method testing\foo::priv() +call_user_func(): Argument #1 ($function) must be a valid callback, cannot access protected method testing\foo::prot() diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt index 3ac9308543..c06803334a 100644 --- a/Zend/tests/call_user_func_002.phpt +++ b/Zend/tests/call_user_func_002.phpt @@ -31,11 +31,11 @@ try { ?> --EXPECTF-- string(3) "foo" -call_user_func() expects argument #1 ($function) to be a valid callback, class 'foo' not found -call_user_func() expects argument #1 ($function) to be a valid callback, class '' not found +call_user_func(): Argument #1 ($function) must be a valid callback, class 'foo' not found +call_user_func(): Argument #1 ($function) must be a valid callback, class '' not found Warning: Undefined variable: foo in %s on line %d -call_user_func() expects argument #1 ($function) to be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object Warning: Undefined variable: foo in %s on line %d -call_user_func() expects argument #1 ($function) to be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/call_user_func_006.phpt b/Zend/tests/call_user_func_006.phpt index 624ce2391c..e45c81dc10 100644 --- a/Zend/tests/call_user_func_006.phpt +++ b/Zend/tests/call_user_func_006.phpt @@ -21,8 +21,8 @@ var_dump($y); ?> --EXPECTF-- -Warning: Foo\bar() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: Foo\bar(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d int(42) -Warning: Foo\bar() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: Foo\bar(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d int(42) diff --git a/Zend/tests/call_user_func_007.phpt b/Zend/tests/call_user_func_007.phpt index 8efa3ab901..4dd7341add 100644 --- a/Zend/tests/call_user_func_007.phpt +++ b/Zend/tests/call_user_func_007.phpt @@ -15,6 +15,6 @@ Notice: Undefined offset: 0 in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d -Warning: foo() expects argument #1 ($ref) to be passed by reference, value given in %s on line %d +Warning: foo(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d array(0) { } diff --git a/Zend/tests/call_user_func_008.phpt b/Zend/tests/call_user_func_008.phpt index c710360a13..1d20bc60d6 100644 --- a/Zend/tests/call_user_func_008.phpt +++ b/Zend/tests/call_user_func_008.phpt @@ -25,30 +25,30 @@ var_dump($i, $j); ?> --EXPECTF-- -Warning: test() expects argument #1 ($ref1) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #1 ($ref1) must be passed by reference, value given in %s on line %d -Warning: test() expects argument #2 ($ref2) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #2 ($ref2) must be passed by reference, value given in %s on line %d bool(true) int(0) int(0) -Warning: test() expects argument #1 ($ref1) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #1 ($ref1) must be passed by reference, value given in %s on line %d -Warning: test() expects argument #2 ($ref2) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #2 ($ref2) must be passed by reference, value given in %s on line %d bool(true) int(0) int(0) -Warning: test() expects argument #1 ($ref1) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #1 ($ref1) must be passed by reference, value given in %s on line %d -Warning: test() expects argument #2 ($ref2) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #2 ($ref2) must be passed by reference, value given in %s on line %d bool(true) int(0) int(0) -Warning: test() expects argument #1 ($ref1) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #1 ($ref1) must be passed by reference, value given in %s on line %d -Warning: test() expects argument #2 ($ref2) to be passed by reference, value given in %s on line %d +Warning: test(): Argument #2 ($ref2) must be passed by reference, value given in %s on line %d bool(true) int(0) int(0) diff --git a/Zend/tests/call_user_func_009.phpt b/Zend/tests/call_user_func_009.phpt index ebbecd73e6..6f2ec7a4b6 100644 --- a/Zend/tests/call_user_func_009.phpt +++ b/Zend/tests/call_user_func_009.phpt @@ -10,8 +10,8 @@ var_dump(\call_user_func('sort', [])); ?> --EXPECTF-- -Warning: sort() expects argument #1 ($arg) to be passed by reference, value given in %s on line %d +Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d bool(true) -Warning: sort() expects argument #1 ($arg) to be passed by reference, value given in %s on line %d +Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d bool(true) diff --git a/Zend/tests/call_user_func_array_invalid_type.phpt b/Zend/tests/call_user_func_array_invalid_type.phpt index a7b5fb3cb7..785a6e35e9 100644 --- a/Zend/tests/call_user_func_array_invalid_type.phpt +++ b/Zend/tests/call_user_func_array_invalid_type.phpt @@ -15,4 +15,4 @@ try { } ?> --EXPECT-- -call_user_func_array() expects argument #2 ($args) to be of type array, null given +call_user_func_array(): Argument #2 ($args) must be of type array, null given diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closure_027.phpt index bffd69c11a..ceffcd72ab 100644 --- a/Zend/tests/closure_027.phpt +++ b/Zend/tests/closure_027.phpt @@ -30,7 +30,7 @@ NULL Warning: Undefined variable: y in %s on line %d Exception: Too few arguments to function {closure}(), 0 passed in %s on line %d and exactly 1 expected -Fatal error: Uncaught TypeError: test() expects argument #1 ($a) to be of type Closure, stdClass given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: test(): Argument #1 ($a) must be of type Closure, stdClass given, called in %s:%d Stack trace: #0 %s(%d): test(Object(stdClass)) #1 {main} diff --git a/Zend/tests/closure_059.phpt b/Zend/tests/closure_059.phpt index c63e654f2d..ab418e42b7 100644 --- a/Zend/tests/closure_059.phpt +++ b/Zend/tests/closure_059.phpt @@ -33,6 +33,6 @@ try { echo "Exception: " . $e->getMessage() . "\n"; } --EXPECTF-- -Exception: {closure}() expects argument #1 ($a) to be of type A, B given, called in %s on line %d -Exception: {closure}() expects argument #1 ($a) to be of type A, B given -Exception: {closure}() expects argument #1 ($a) to be of type A, B given +Exception: {closure}(): Argument #1 ($a) must be of type A, B given, called in %s on line %d +Exception: {closure}(): Argument #1 ($a) must be of type A, B given +Exception: {closure}(): Argument #1 ($a) must be of type A, B given diff --git a/Zend/tests/exception_017.phpt b/Zend/tests/exception_017.phpt index 4299ada5c0..f2f5f964ce 100644 --- a/Zend/tests/exception_017.phpt +++ b/Zend/tests/exception_017.phpt @@ -28,7 +28,7 @@ Error: Cannot call abstract method C::foo() in %s:%d Stack trace: #0 {main} -TypeError: foo() expects argument #1 ($x) to be of type callable, string given, called in %s on line %d and defined in %s:%d +TypeError: foo(): Argument #1 ($x) must be of type callable, string given, called in %s:%d Stack trace: #0 %s(%d): foo('C::foo') #1 {main} diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt index e4684e942d..757a1b7f2d 100644 --- a/Zend/tests/exception_handler_004.phpt +++ b/Zend/tests/exception_handler_004.phpt @@ -9,7 +9,7 @@ set_exception_handler(array("", "")); echo "Done\n"; ?> --EXPECTF-- -Warning: set_exception_handler() expects argument #1 ($exception_handler) to be a valid callback in %s on line %d +Warning: set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback in %s on line %d -Warning: set_exception_handler() expects argument #1 ($exception_handler) to be a valid callback in %s on line %d +Warning: set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback in %s on line %d Done diff --git a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt index c8977ece99..206b96149b 100644 --- a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt +++ b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt @@ -49,6 +49,6 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected ArgumentCountError Too few arguments to function bat(), 1 passed in %s and exactly 2 expected TypeError -bat() expects argument #1 ($foo) to be of type int, string given, called in %s on line %d +bat(): Argument #1 ($foo) must be of type int, string given, called in %s on line %d TypeError -bat() expects argument #2 ($bar) to be of type string, int given, called in %s on line %d +bat(): Argument #2 ($bar) must be of type string, int given, called in %s on line %d diff --git a/Zend/tests/function_arguments/variadic_argument_type_error.phpt b/Zend/tests/function_arguments/variadic_argument_type_error.phpt index ee244ab4a1..3a9bc050cc 100644 --- a/Zend/tests/function_arguments/variadic_argument_type_error.phpt +++ b/Zend/tests/function_arguments/variadic_argument_type_error.phpt @@ -18,5 +18,5 @@ try { } --EXPECTF-- -foo() expects argument #2 ($bar) to be of type int, array given, called in %s on line %d -foo() expects argument #4 ($bar) to be of type int, array given, called in %s on line %d +foo(): Argument #2 ($bar) must be of type int, array given, called in %s on line %d +foo(): Argument #4 ($bar) must be of type int, array given, called in %s on line %d diff --git a/Zend/tests/generators/generator_with_type_check.phpt b/Zend/tests/generators/generator_with_type_check.phpt index 90636406b4..67d19ab947 100644 --- a/Zend/tests/generators/generator_with_type_check.phpt +++ b/Zend/tests/generators/generator_with_type_check.phpt @@ -6,7 +6,7 @@ function gen(array $a) { yield; } gen(42); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: gen() expects argument #1 ($a) to be of type array, int given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: gen(): Argument #1 ($a) must be of type array, int given, called in %s:%d Stack trace: #0 %sgenerator_with_type_check.php(3): gen(42) #1 {main} diff --git a/Zend/tests/generators/generator_with_type_check_2.phpt b/Zend/tests/generators/generator_with_type_check_2.phpt index 445c8f4a9f..21e8ab8bed 100644 --- a/Zend/tests/generators/generator_with_type_check_2.phpt +++ b/Zend/tests/generators/generator_with_type_check_2.phpt @@ -18,5 +18,5 @@ try { } ?> --EXPECTF-- -gen() expects argument #1 ($a) to be of type array, int given, called in %s on line %d -gen() expects argument #1 ($a) to be of type array, int given, called in %s on line %d +gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d +gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d diff --git a/Zend/tests/generators/throw_not_an_exception.phpt b/Zend/tests/generators/throw_not_an_exception.phpt index dcb1d3d0b0..d1ff81882f 100644 --- a/Zend/tests/generators/throw_not_an_exception.phpt +++ b/Zend/tests/generators/throw_not_an_exception.phpt @@ -12,7 +12,7 @@ $gen->throw(new stdClass); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Generator::throw() expects argument #1 ($exception) to be of type Throwable, object given in %s:%d +Fatal error: Uncaught TypeError: Generator::throw(): Argument #1 ($exception) must be of type Throwable, object given in %s:%d Stack trace: #0 %s(%d): Generator->throw(Object(stdClass)) #1 {main} diff --git a/Zend/tests/methods-on-non-objects-call-user-func.phpt b/Zend/tests/methods-on-non-objects-call-user-func.phpt index 5ccf9e0d26..c158cd1ca1 100644 --- a/Zend/tests/methods-on-non-objects-call-user-func.phpt +++ b/Zend/tests/methods-on-non-objects-call-user-func.phpt @@ -10,4 +10,4 @@ try { } ?> --EXPECT-- -call_user_func() expects argument #1 ($function) to be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/ns_071.phpt b/Zend/tests/ns_071.phpt index cee6431be0..b0126e399f 100644 --- 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() expects argument #1 ($x) to be of type ?array, object given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo\bar::__construct(): Argument #1 ($x) must be of type ?array, object given, called in %s:%d Stack trace: #0 %s(%d): foo\bar->__construct(Object(stdClass)) #1 {main} diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt index 6429632658..b41fe29778 100644 --- a/Zend/tests/ns_072.phpt +++ b/Zend/tests/ns_072.phpt @@ -30,7 +30,7 @@ object(foo\test)#%d (0) { } NULL -Fatal error: Uncaught TypeError: foo\bar::__construct() expects argument #1 ($x) to be of type ?foo\foo, stdClass given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo\bar::__construct(): Argument #1 ($x) must be of type ?foo\foo, 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/type_hint_in_class_method.phpt b/Zend/tests/object_types/type_hint_in_class_method.phpt index 098bfc0c52..f23189cb50 100644 --- a/Zend/tests/object_types/type_hint_in_class_method.phpt +++ b/Zend/tests/object_types/type_hint_in_class_method.phpt @@ -11,7 +11,7 @@ $one = new One(); $one->a(new One()); $one->a(123); --EXPECTF-- -Fatal error: Uncaught TypeError: One::a() expects argument #1 ($obj) to be of type object, int given, called in %s:%d +Fatal error: Uncaught TypeError: One::a(): Argument #1 ($obj) must be of type object, int given, called in %s:%d Stack trace: #0 %s(9): One->a(123) #1 {main} diff --git a/Zend/tests/object_types/type_hint_in_function.phpt b/Zend/tests/object_types/type_hint_in_function.phpt index e834997f4d..f35e73b3a7 100644 --- a/Zend/tests/object_types/type_hint_in_function.phpt +++ b/Zend/tests/object_types/type_hint_in_function.phpt @@ -9,7 +9,7 @@ function a(object $obj) {} a(new A()); a(123); --EXPECTF-- -Fatal error: Uncaught TypeError: a() expects argument #1 ($obj) to be of type object, int given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: a(): Argument #1 ($obj) must be of type object, int given, called in %s:%d Stack trace: #0 %s(7): a(123) #1 {main} diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt index ce2d2f7c00..5fa6f8e95d 100644 --- a/Zend/tests/objects_022.phpt +++ b/Zend/tests/objects_022.phpt @@ -36,7 +36,7 @@ object(bar)#%d (0) { object(baz)#%d (0) { } -Fatal error: Uncaught TypeError: foo::testFoo() expects argument #1 ($obj) to be of type foo, stdClass given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo::testFoo(): Argument #1 ($obj) must be of type foo, stdClass given, called in %s:%d Stack trace: #0 %s(%d): foo->testFoo(Object(stdClass)) #1 {main} diff --git a/Zend/tests/trait_type_errors.phpt b/Zend/tests/trait_type_errors.phpt index 1d29714a2f..2f5069a433 100644 --- a/Zend/tests/trait_type_errors.phpt +++ b/Zend/tests/trait_type_errors.phpt @@ -39,5 +39,5 @@ try { ?> --EXPECTF-- Return value of C::test1() must be of type int, string returned -C::test2() expects argument #1 ($arg) to be of type int, string given, called in %s on line %d -C::test3() expects argument #1 ($arg) to be of type int, string given, called in %s on line %d +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/array_001.phpt b/Zend/tests/type_declarations/array_001.phpt index 0e08bd8b7f..5739ae1b72 100644 --- a/Zend/tests/type_declarations/array_001.phpt +++ b/Zend/tests/type_declarations/array_001.phpt @@ -12,7 +12,7 @@ foo(123); --EXPECTF-- 3 -Fatal error: Uncaught TypeError: foo() expects argument #1 ($a) to be of type array, int given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo(): Argument #1 ($a) must be of type array, int given, called in %s:%d Stack trace: #0 %s(%d): foo(123) #1 {main} diff --git a/Zend/tests/type_declarations/callable_001.phpt b/Zend/tests/type_declarations/callable_001.phpt index e6c2702235..6b555f40e6 100644 --- a/Zend/tests/type_declarations/callable_001.phpt +++ b/Zend/tests/type_declarations/callable_001.phpt @@ -29,7 +29,7 @@ array(2) { string(3) "foo" } -Fatal error: Uncaught TypeError: foo() expects argument #1 ($bar) to be of type callable, array given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo(): Argument #1 ($bar) must be of type callable, array given, called in %s:%d Stack trace: #0 %s(%d): foo(Array) #1 {main} diff --git a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt index 5ad7bd17fc..60d4159dc2 100644 --- a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt +++ b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt @@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc'; // calls within that file should stay strict, despite being included by weak file ?> --EXPECTF-- -Fatal error: Uncaught TypeError: takes_int() expects argument #1 ($x) to be of type int, float given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: takes_int(): Argument #1 ($x) must be of type int, float given, called in %s:%d Stack trace: #0 %s(%d): takes_int(1) #1 %s(%d): require('%s') diff --git a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt index 661616fb92..d70f7e240a 100644 --- a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt +++ b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt @@ -8,7 +8,7 @@ foo(null); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: foo() expects argument #1 ($ex) to be of type bar, null given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: foo(): Argument #1 ($ex) must be of type bar, null given, called in %s:%d Stack trace: #0 %s(%d): foo(NULL) #1 {main} diff --git a/Zend/tests/type_declarations/internal_function_strict_mode.phpt b/Zend/tests/type_declarations/internal_function_strict_mode.phpt index b3b9adc9d3..04c59ae341 100644 --- a/Zend/tests/type_declarations/internal_function_strict_mode.phpt +++ b/Zend/tests/type_declarations/internal_function_strict_mode.phpt @@ -28,8 +28,8 @@ try { ?> --EXPECT-- *** Trying Ord With Integer -*** Caught ord() expects argument #1 ($character) to be of type string, int given +*** Caught ord(): Argument #1 ($character) must be of type string, int given *** Trying Array Map With Invalid Callback -*** Caught array_map() expects argument #1 ($callback) to be a valid callback, first array member is not a valid class name or object +*** Caught array_map(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object *** Trying Strlen With Float -*** Caught strlen() expects argument #1 ($str) to be of type string, float given +*** Caught strlen(): Argument #1 ($str) must be of type string, float given diff --git a/Zend/tests/type_declarations/iterable_001.phpt b/Zend/tests/type_declarations/iterable_001.phpt index 856dc63c4d..e5f21957ba 100644 --- a/Zend/tests/type_declarations/iterable_001.phpt +++ b/Zend/tests/type_declarations/iterable_001.phpt @@ -44,4 +44,4 @@ object(ArrayIterator)#1 (1) { int(3) } } -test() expects argument #1 ($iterable) to be of type iterable, int given, called in %s on line %d +test(): Argument #1 ($iterable) must be of type iterable, int given, called in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt index ef10e67ac0..e4b8ab5c51 100644 --- a/Zend/tests/type_declarations/scalar_basic.phpt +++ b/Zend/tests/type_declarations/scalar_basic.phpt @@ -78,16 +78,16 @@ E_NOTICE: A non well formed numeric value encountered on line %d int(1) *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying int(%d) int(%d) *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying bool(true) int(1) @@ -96,22 +96,22 @@ int(1) int(0) *** Trying NULL -*** Caught {closure}() expects argument #1 ($i) to be of type int, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d *** Trying object(stdClass)#%s (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying object(Stringable)#%s (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying resource(%d) of type (stream) -*** Caught {closure}() expects argument #1 ($i) to be of type int, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d Testing 'float' type: @@ -132,10 +132,10 @@ E_NOTICE: A non well formed numeric value encountered on line %d float(1) *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying int(%d) float(%s) @@ -150,22 +150,22 @@ float(1) float(0) *** Trying NULL -*** Caught {closure}() expects argument #1 ($f) to be of type float, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d *** Trying object(stdClass)#%s (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying object(Stringable)#%s (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying resource(%d) of type (stream) -*** Caught {closure}() expects argument #1 ($f) to be of type float, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d Testing 'string' type: @@ -203,22 +203,22 @@ string(1) "1" string(0) "" *** Trying NULL -*** Caught {closure}() expects argument #1 ($s) to be of type string, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d *** Trying object(stdClass)#%s (0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying object(Stringable)#%s (0) { } string(6) "foobar" *** Trying resource(%d) of type (stream) -*** Caught {closure}() expects argument #1 ($s) to be of type string, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d Testing 'bool' type: @@ -256,21 +256,21 @@ bool(true) bool(false) *** Trying NULL -*** Caught {closure}() expects argument #1 ($b) to be of type bool, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d *** Trying object(stdClass)#%s (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying object(Stringable)#%s (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying resource(%d) of type (stream) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d Done diff --git a/Zend/tests/type_declarations/scalar_constant_defaults.phpt b/Zend/tests/type_declarations/scalar_constant_defaults.phpt index 28f0252cdf..5e3826de7d 100644 --- a/Zend/tests/type_declarations/scalar_constant_defaults.phpt +++ b/Zend/tests/type_declarations/scalar_constant_defaults.phpt @@ -96,9 +96,9 @@ float(10.7) Testing string add val string(14) "this is a test" Testing int with default null constant -int_val_default_null() expects argument #1 ($a) to be of type int, null given, called in %s on line %d +int_val_default_null(): Argument #1 ($a) must be of type int, null given, called in %s on line %d Testing int with null null constant -int_val_default_null() expects argument #1 ($a) to be of type int, null given, called in %s on line %d +int_val_default_null(): Argument #1 ($a) must be of type int, null given, called in %s on line %d Testing nullable int with default null constant NULL Testing nullable int with null null constant diff --git a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt index 66d56e72df..72cc9820da 100644 --- a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt +++ b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt @@ -13,7 +13,7 @@ var_dump(int_val()); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: int_val() expects argument #1 ($a) to be of type int, string given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: int_val(): Argument #1 ($a) must be of type int, string given, called in %s:%d Stack trace: #0 %s(%d): int_val() #1 {main} diff --git a/Zend/tests/type_declarations/scalar_null.phpt b/Zend/tests/type_declarations/scalar_null.phpt index ab9647ba9c..d1ade3ad48 100644 --- a/Zend/tests/type_declarations/scalar_null.phpt +++ b/Zend/tests/type_declarations/scalar_null.phpt @@ -27,13 +27,13 @@ echo PHP_EOL . "Done"; ?> --EXPECTF-- Testing int: -*** Caught {closure}() expects argument #1 ($i) to be of type int, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d Testing float: -*** Caught {closure}() expects argument #1 ($f) to be of type float, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d Testing string: -*** Caught {closure}() expects argument #1 ($s) to be of type string, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d Testing bool: -*** Caught {closure}() expects argument #1 ($b) to be of type bool, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d Testing int nullable: NULL Testing float nullable: diff --git a/Zend/tests/type_declarations/scalar_strict.phpt b/Zend/tests/type_declarations/scalar_strict.phpt index 89ab6a024b..032fd3d301 100644 --- a/Zend/tests/type_declarations/scalar_strict.phpt +++ b/Zend/tests/type_declarations/scalar_strict.phpt @@ -60,52 +60,52 @@ Testing 'int' type: int(1) *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying int(2147483647) int(2147483647) *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($i) to be of type int, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($i) to be of type int, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d Testing 'float' type: @@ -113,7 +113,7 @@ Testing 'float' type: float(1) *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying float(1) float(1) @@ -122,13 +122,13 @@ float(1) float(1.5) *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying int(2147483647) float(2147483647) @@ -137,42 +137,42 @@ float(2147483647) float(NAN) *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($f) to be of type float, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($f) to be of type float, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d Testing 'string' type: *** Trying int(1) -*** Caught {closure}() expects argument #1 ($s) to be of type string, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying string(1) "1" string(1) "1" *** Trying float(1) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying string(2) "1a" string(2) "1a" @@ -184,63 +184,63 @@ string(1) "a" string(0) "" *** Trying int(2147483647) -*** Caught {closure}() expects argument #1 ($s) to be of type string, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($s) to be of type string, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($s) to be of type string, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d Testing 'bool' type: *** Trying int(1) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying int(2147483647) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying bool(true) bool(true) @@ -249,21 +249,21 @@ bool(true) bool(false) *** Trying NULL -*** Caught {closure}() expects argument #1 ($b) to be of type bool, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d Done diff --git a/Zend/tests/type_declarations/scalar_strict_64bit.phpt b/Zend/tests/type_declarations/scalar_strict_64bit.phpt index 2d00b6f23b..5818606b4c 100644 --- a/Zend/tests/type_declarations/scalar_strict_64bit.phpt +++ b/Zend/tests/type_declarations/scalar_strict_64bit.phpt @@ -60,52 +60,52 @@ Testing 'int' type: int(1) *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying int(9223372036854775807) int(9223372036854775807) *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($i) to be of type int, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($i) to be of type int, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d Testing 'float' type: @@ -113,7 +113,7 @@ Testing 'float' type: float(1) *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying float(1) float(1) @@ -122,13 +122,13 @@ float(1) float(1.5) *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying int(9223372036854775807) float(9.223372036854776E+18) @@ -137,42 +137,42 @@ float(9.223372036854776E+18) float(NAN) *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($f) to be of type float, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($f) to be of type float, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d Testing 'string' type: *** Trying int(1) -*** Caught {closure}() expects argument #1 ($s) to be of type string, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying string(1) "1" string(1) "1" *** Trying float(1) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying string(2) "1a" string(2) "1a" @@ -184,63 +184,63 @@ string(1) "a" string(0) "" *** Trying int(9223372036854775807) -*** Caught {closure}() expects argument #1 ($s) to be of type string, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying NULL -*** Caught {closure}() expects argument #1 ($s) to be of type string, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($s) to be of type string, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d Testing 'bool' type: *** Trying int(1) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying string(1) "1" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying int(9223372036854775807) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying bool(true) bool(true) @@ -249,21 +249,21 @@ bool(true) bool(false) *** Trying NULL -*** Caught {closure}() expects argument #1 ($b) to be of type bool, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying object(Stringable)#6 (0) { } -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}() expects argument #1 ($b) to be of type bool, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d Done diff --git a/Zend/tests/type_declarations/scalar_strict_basic.phpt b/Zend/tests/type_declarations/scalar_strict_basic.phpt index d3050314f4..cb385422bd 100644 --- a/Zend/tests/type_declarations/scalar_strict_basic.phpt +++ b/Zend/tests/type_declarations/scalar_strict_basic.phpt @@ -57,28 +57,28 @@ Testing 'int' type: int(1) *** Trying float value -*** Caught {closure}() expects argument #1 ($i) to be of type int, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying string value -*** Caught {closure}() expects argument #1 ($i) to be of type int, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying true value -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying false value -*** Caught {closure}() expects argument #1 ($i) to be of type int, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d *** Trying null value -*** Caught {closure}() expects argument #1 ($i) to be of type int, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d *** Trying array value -*** Caught {closure}() expects argument #1 ($i) to be of type int, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d *** Trying object value -*** Caught {closure}() expects argument #1 ($i) to be of type int, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, object given, called in %s on line %d *** Trying resource value -*** Caught {closure}() expects argument #1 ($i) to be of type int, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d Testing 'float' type: @@ -89,65 +89,65 @@ float(1) float(1) *** Trying string value -*** Caught {closure}() expects argument #1 ($f) to be of type float, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying true value -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying false value -*** Caught {closure}() expects argument #1 ($f) to be of type float, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d *** Trying null value -*** Caught {closure}() expects argument #1 ($f) to be of type float, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d *** Trying array value -*** Caught {closure}() expects argument #1 ($f) to be of type float, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d *** Trying object value -*** Caught {closure}() expects argument #1 ($f) to be of type float, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, object given, called in %s on line %d *** Trying resource value -*** Caught {closure}() expects argument #1 ($f) to be of type float, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d Testing 'string' type: *** Trying integer value -*** Caught {closure}() expects argument #1 ($s) to be of type string, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying float value -*** Caught {closure}() expects argument #1 ($s) to be of type string, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying string value string(1) "1" *** Trying true value -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying false value -*** Caught {closure}() expects argument #1 ($s) to be of type string, bool given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d *** Trying null value -*** Caught {closure}() expects argument #1 ($s) to be of type string, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d *** Trying array value -*** Caught {closure}() expects argument #1 ($s) to be of type string, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d *** Trying object value -*** Caught {closure}() expects argument #1 ($s) to be of type string, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, object given, called in %s on line %d *** Trying resource value -*** Caught {closure}() expects argument #1 ($s) to be of type string, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d Testing 'bool' type: *** Trying integer value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, int given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying float value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, float given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying string value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, string given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying true value bool(true) @@ -156,15 +156,15 @@ bool(true) bool(false) *** Trying null value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, null given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d *** Trying array value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, array given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d *** Trying object value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, object given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, object given, called in %s on line %d *** Trying resource value -*** Caught {closure}() expects argument #1 ($b) to be of type bool, resource given, called in %s on line %d +*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d Done diff --git a/Zend/tests/type_declarations/strict_call_weak.phpt b/Zend/tests/type_declarations/strict_call_weak.phpt index e20524b2d5..55da67a6ef 100644 --- a/Zend/tests/type_declarations/strict_call_weak.phpt +++ b/Zend/tests/type_declarations/strict_call_weak.phpt @@ -13,7 +13,7 @@ require 'strict_call_weak_2.inc'; function_declared_in_weak_mode(1.0); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: function_declared_in_weak_mode() expects argument #1 ($x) to be of type int, float given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: function_declared_in_weak_mode(): Argument #1 ($x) must be of type int, float given, called in %s:%d Stack trace: #0 %s(%d): function_declared_in_weak_mode(1) #1 {main} diff --git a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt index b6b382e5cc..14b460aa9d 100644 --- a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt +++ b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt @@ -13,7 +13,7 @@ require 'strict_call_weak_explicit_2.inc'; function_declared_in_weak_mode(1.0); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: function_declared_in_weak_mode() expects argument #1 ($x) to be of type int, float given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: function_declared_in_weak_mode(): Argument #1 ($x) must be of type int, float given, called in %s:%d Stack trace: #0 %s(%d): function_declared_in_weak_mode(1) #1 {main} diff --git a/Zend/tests/type_declarations/union_types/multiple_classes.phpt b/Zend/tests/type_declarations/union_types/multiple_classes.phpt index 3187415586..b45fc02d83 100644 --- a/Zend/tests/type_declarations/union_types/multiple_classes.phpt +++ b/Zend/tests/type_declarations/union_types/multiple_classes.phpt @@ -68,7 +68,7 @@ int(42) int(42) int(42) Cannot assign stdClass to property Test::$prop of type X|Y|Z|int -Test::method() expects argument #1 ($arg) to be of type X|Y|Z|int, stdClass given, called in %s on line %d +Test::method(): Argument #1 ($arg) must be of type X|Y|Z|int, stdClass given, called in %s on line %d object(X)#4 (0) { } object(X)#6 (0) { diff --git a/Zend/tests/type_declarations/union_types/type_checking_strict.phpt b/Zend/tests/type_declarations/union_types/type_checking_strict.phpt index 81c75328d6..4887b3b796 100644 --- a/Zend/tests/type_declarations/union_types/type_checking_strict.phpt +++ b/Zend/tests/type_declarations/union_types/type_checking_strict.phpt @@ -37,7 +37,7 @@ function test(string $type, array $values) { } catch (TypeError $e) { $msg = $e->getMessage(); $msg = strstr($msg, ', called in', true); - $msg = str_replace('{closure}() expects argument #1', 'Argument ...', $msg); + $msg = str_replace('{closure}(): Argument #1 ($arg)', 'Argument ...', $msg); echo $msg; } echo "\n"; @@ -70,86 +70,86 @@ Type int|float: 42 => 42 42.0 => 42.0 INF => INF -"42" => Argument ... ($arg) to be of type int|float, string given -"42.0" => Argument ... ($arg) to be of type int|float, string given -"42x" => Argument ... ($arg) to be of type int|float, string given -"x" => Argument ... ($arg) to be of type int|float, string given -"" => Argument ... ($arg) to be of type int|float, string given -true => Argument ... ($arg) to be of type int|float, bool given -false => Argument ... ($arg) to be of type int|float, bool given -null => Argument ... ($arg) to be of type int|float, null given -[] => Argument ... ($arg) to be of type int|float, array given -new stdClass => Argument ... ($arg) to be of type int|float, object given -new WithToString => Argument ... ($arg) to be of type int|float, object given +"42" => Argument ... must be of type int|float, string given +"42.0" => Argument ... must be of type int|float, string given +"42x" => Argument ... must be of type int|float, string given +"x" => Argument ... must be of type int|float, string given +"" => Argument ... must be of type int|float, string given +true => Argument ... must be of type int|float, bool given +false => Argument ... must be of type int|float, bool given +null => Argument ... must be of type int|float, null given +[] => Argument ... must be of type int|float, array given +new stdClass => Argument ... must be of type int|float, object given +new WithToString => Argument ... must be of type int|float, object given Type int|float|false: 42 => 42 42.0 => 42.0 INF => INF -"42" => Argument ... ($arg) to be of type int|float|false, string given -"42.0" => Argument ... ($arg) to be of type int|float|false, string given -"42x" => Argument ... ($arg) to be of type int|float|false, string given -"x" => Argument ... ($arg) to be of type int|float|false, string given -"" => Argument ... ($arg) to be of type int|float|false, string given -true => Argument ... ($arg) to be of type int|float|false, bool given +"42" => Argument ... must be of type int|float|false, string given +"42.0" => Argument ... must be of type int|float|false, string given +"42x" => Argument ... must be of type int|float|false, string given +"x" => Argument ... must be of type int|float|false, string given +"" => Argument ... must be of type int|float|false, string given +true => Argument ... must be of type int|float|false, bool given false => false -null => Argument ... ($arg) to be of type int|float|false, null given -[] => Argument ... ($arg) to be of type int|float|false, array given -new stdClass => Argument ... ($arg) to be of type int|float|false, object given -new WithToString => Argument ... ($arg) to be of type int|float|false, object given +null => Argument ... must be of type int|float|false, null given +[] => Argument ... must be of type int|float|false, array given +new stdClass => Argument ... must be of type int|float|false, object given +new WithToString => Argument ... must be of type int|float|false, object given Type int|float|bool: 42 => 42 42.0 => 42.0 INF => INF -"42" => Argument ... ($arg) to be of type int|float|bool, string given -"42.0" => Argument ... ($arg) to be of type int|float|bool, string given -"42x" => Argument ... ($arg) to be of type int|float|bool, string given -"x" => Argument ... ($arg) to be of type int|float|bool, string given -"" => Argument ... ($arg) to be of type int|float|bool, string given +"42" => Argument ... must be of type int|float|bool, string given +"42.0" => Argument ... must be of type int|float|bool, string given +"42x" => Argument ... must be of type int|float|bool, string given +"x" => Argument ... must be of type int|float|bool, string given +"" => Argument ... must be of type int|float|bool, string given true => true false => false -null => Argument ... ($arg) to be of type int|float|bool, null given -[] => Argument ... ($arg) to be of type int|float|bool, array given -new stdClass => Argument ... ($arg) to be of type int|float|bool, object given -new WithToString => Argument ... ($arg) to be of type int|float|bool, object given +null => Argument ... must be of type int|float|bool, null given +[] => Argument ... must be of type int|float|bool, array given +new stdClass => Argument ... must be of type int|float|bool, object given +new WithToString => Argument ... must be of type int|float|bool, object given Type int|bool: 42 => 42 -42.0 => Argument ... ($arg) to be of type int|bool, float given -INF => Argument ... ($arg) to be of type int|bool, float given -"42" => Argument ... ($arg) to be of type int|bool, string given -"42.0" => Argument ... ($arg) to be of type int|bool, string given -"42x" => Argument ... ($arg) to be of type int|bool, string given -"x" => Argument ... ($arg) to be of type int|bool, string given -"" => Argument ... ($arg) to be of type int|bool, string given +42.0 => Argument ... must be of type int|bool, float given +INF => Argument ... must be of type int|bool, float given +"42" => Argument ... must be of type int|bool, string given +"42.0" => Argument ... must be of type int|bool, string given +"42x" => Argument ... must be of type int|bool, string given +"x" => Argument ... must be of type int|bool, string given +"" => Argument ... must be of type int|bool, string given true => true false => false -null => Argument ... ($arg) to be of type int|bool, null given -[] => Argument ... ($arg) to be of type int|bool, array given -new stdClass => Argument ... ($arg) to be of type int|bool, object given -new WithToString => Argument ... ($arg) to be of type int|bool, object given +null => Argument ... must be of type int|bool, null given +[] => Argument ... must be of type int|bool, array given +new stdClass => Argument ... must be of type int|bool, object given +new WithToString => Argument ... must be of type int|bool, object given Type int|string|null: 42 => 42 -42.0 => Argument ... ($arg) to be of type string|int|null, float given -INF => Argument ... ($arg) to be of type string|int|null, float given +42.0 => Argument ... must be of type string|int|null, float given +INF => Argument ... must be of type string|int|null, float given "42" => "42" "42.0" => "42.0" "42x" => "42x" "x" => "x" "" => "" -true => Argument ... ($arg) to be of type string|int|null, bool given -false => Argument ... ($arg) to be of type string|int|null, bool given +true => Argument ... must be of type string|int|null, bool given +false => Argument ... must be of type string|int|null, bool given null => null -[] => Argument ... ($arg) to be of type string|int|null, array given -new stdClass => Argument ... ($arg) to be of type string|int|null, object given -new WithToString => Argument ... ($arg) to be of type string|int|null, object given +[] => Argument ... must be of type string|int|null, array given +new stdClass => Argument ... must be of type string|int|null, object given +new WithToString => Argument ... must be of type string|int|null, object given Type string|bool: -42 => Argument ... ($arg) to be of type string|bool, int given -42.0 => Argument ... ($arg) to be of type string|bool, float given -INF => Argument ... ($arg) to be of type string|bool, float given +42 => Argument ... must be of type string|bool, int given +42.0 => Argument ... must be of type string|bool, float given +INF => Argument ... must be of type string|bool, float given "42" => "42" "42.0" => "42.0" "42x" => "42x" @@ -157,55 +157,55 @@ INF => Argument ... ($arg) to be of type string|bool, float given "" => "" true => true false => false -null => Argument ... ($arg) to be of type string|bool, null given -[] => Argument ... ($arg) to be of type string|bool, array given -new stdClass => Argument ... ($arg) to be of type string|bool, object given -new WithToString => Argument ... ($arg) to be of type string|bool, object given +null => Argument ... must be of type string|bool, null given +[] => Argument ... must be of type string|bool, array given +new stdClass => Argument ... must be of type string|bool, object given +new WithToString => Argument ... must be of type string|bool, object given Type float|array: 42 => 42.0 42.0 => 42.0 INF => INF -"42" => Argument ... ($arg) to be of type array|float, string given -"42.0" => Argument ... ($arg) to be of type array|float, string given -"42x" => Argument ... ($arg) to be of type array|float, string given -"x" => Argument ... ($arg) to be of type array|float, string given -"" => Argument ... ($arg) to be of type array|float, string given -true => Argument ... ($arg) to be of type array|float, bool given -false => Argument ... ($arg) to be of type array|float, bool given -null => Argument ... ($arg) to be of type array|float, null given +"42" => Argument ... must be of type array|float, string given +"42.0" => Argument ... must be of type array|float, string given +"42x" => Argument ... must be of type array|float, string given +"x" => Argument ... must be of type array|float, string given +"" => Argument ... must be of type array|float, string given +true => Argument ... must be of type array|float, bool given +false => Argument ... must be of type array|float, bool given +null => Argument ... must be of type array|float, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|float, object given -new WithToString => Argument ... ($arg) to be of type array|float, object given +new stdClass => Argument ... must be of type array|float, object given +new WithToString => Argument ... must be of type array|float, object given Type string|array: -42 => Argument ... ($arg) to be of type array|string, int given -42.0 => Argument ... ($arg) to be of type array|string, float given -INF => Argument ... ($arg) to be of type array|string, float given +42 => Argument ... must be of type array|string, int given +42.0 => Argument ... must be of type array|string, float given +INF => Argument ... must be of type array|string, float given "42" => "42" "42.0" => "42.0" "42x" => "42x" "x" => "x" "" => "" -true => Argument ... ($arg) to be of type array|string, bool given -false => Argument ... ($arg) to be of type array|string, bool given -null => Argument ... ($arg) to be of type array|string, null given +true => Argument ... must be of type array|string, bool given +false => Argument ... must be of type array|string, bool given +null => Argument ... must be of type array|string, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|string, object given -new WithToString => Argument ... ($arg) to be of type array|string, object given +new stdClass => Argument ... must be of type array|string, object given +new WithToString => Argument ... must be of type array|string, object given Type bool|array: -42 => Argument ... ($arg) to be of type array|bool, int given -42.0 => Argument ... ($arg) to be of type array|bool, float given -INF => Argument ... ($arg) to be of type array|bool, float given -"42" => Argument ... ($arg) to be of type array|bool, string given -"42.0" => Argument ... ($arg) to be of type array|bool, string given -"42x" => Argument ... ($arg) to be of type array|bool, string given -"x" => Argument ... ($arg) to be of type array|bool, string given -"" => Argument ... ($arg) to be of type array|bool, string given +42 => Argument ... must be of type array|bool, int given +42.0 => Argument ... must be of type array|bool, float given +INF => Argument ... must be of type array|bool, float given +"42" => Argument ... must be of type array|bool, string given +"42.0" => Argument ... must be of type array|bool, string given +"42x" => Argument ... must be of type array|bool, string given +"x" => Argument ... must be of type array|bool, string given +"" => Argument ... must be of type array|bool, string given true => true false => false -null => Argument ... ($arg) to be of type array|bool, null given +null => Argument ... must be of type array|bool, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|bool, object given -new WithToString => Argument ... ($arg) to be of type array|bool, object given +new stdClass => Argument ... must be of type array|bool, object given +new WithToString => Argument ... must be of type array|bool, object given diff --git a/Zend/tests/type_declarations/union_types/type_checking_weak.phpt b/Zend/tests/type_declarations/union_types/type_checking_weak.phpt index c48e95f640..1b9fa4b316 100644 --- a/Zend/tests/type_declarations/union_types/type_checking_weak.phpt +++ b/Zend/tests/type_declarations/union_types/type_checking_weak.phpt @@ -35,7 +35,7 @@ function test(string $type, array $values) { } catch (TypeError $e) { $msg = $e->getMessage(); $msg = strstr($msg, ', called in', true); - $msg = str_replace('{closure}() expects argument #1', 'Argument ...', $msg); + $msg = str_replace('{closure}(): Argument #1 ($arg)', 'Argument ...', $msg); echo $msg; } echo "\n"; @@ -71,14 +71,14 @@ INF => INF "42" => 42 "42.0" => 42.0 "42x" => 42 (A non well formed numeric value encountered) -"x" => Argument ... ($arg) to be of type int|float, string given -"" => Argument ... ($arg) to be of type int|float, string given +"x" => Argument ... must be of type int|float, string given +"" => Argument ... must be of type int|float, string given true => 1 false => 0 -null => Argument ... ($arg) to be of type int|float, null given -[] => Argument ... ($arg) to be of type int|float, array given -new stdClass => Argument ... ($arg) to be of type int|float, object given -new WithToString => Argument ... ($arg) to be of type int|float, object given +null => Argument ... must be of type int|float, null given +[] => Argument ... must be of type int|float, array given +new stdClass => Argument ... must be of type int|float, object given +new WithToString => Argument ... must be of type int|float, object given Type int|float|false: 42 => 42 @@ -87,14 +87,14 @@ INF => INF "42" => 42 "42.0" => 42.0 "42x" => 42 (A non well formed numeric value encountered) -"x" => Argument ... ($arg) to be of type int|float|false, string given -"" => Argument ... ($arg) to be of type int|float|false, string given +"x" => Argument ... must be of type int|float|false, string given +"" => Argument ... must be of type int|float|false, string given true => 1 false => false -null => Argument ... ($arg) to be of type int|float|false, null given -[] => Argument ... ($arg) to be of type int|float|false, array given -new stdClass => Argument ... ($arg) to be of type int|float|false, object given -new WithToString => Argument ... ($arg) to be of type int|float|false, object given +null => Argument ... must be of type int|float|false, null given +[] => Argument ... must be of type int|float|false, array given +new stdClass => Argument ... must be of type int|float|false, object given +new WithToString => Argument ... must be of type int|float|false, object given Type int|float|bool: 42 => 42 @@ -107,10 +107,10 @@ INF => INF "" => false true => true false => false -null => Argument ... ($arg) to be of type int|float|bool, null given -[] => Argument ... ($arg) to be of type int|float|bool, array given -new stdClass => Argument ... ($arg) to be of type int|float|bool, object given -new WithToString => Argument ... ($arg) to be of type int|float|bool, object given +null => Argument ... must be of type int|float|bool, null given +[] => Argument ... must be of type int|float|bool, array given +new stdClass => Argument ... must be of type int|float|bool, object given +new WithToString => Argument ... must be of type int|float|bool, object given Type int|bool: 42 => 42 @@ -123,10 +123,10 @@ INF => true "" => false true => true false => false -null => Argument ... ($arg) to be of type int|bool, null given -[] => Argument ... ($arg) to be of type int|bool, array given -new stdClass => Argument ... ($arg) to be of type int|bool, object given -new WithToString => Argument ... ($arg) to be of type int|bool, object given +null => Argument ... must be of type int|bool, null given +[] => Argument ... must be of type int|bool, array given +new stdClass => Argument ... must be of type int|bool, object given +new WithToString => Argument ... must be of type int|bool, object given Type int|string|null: 42 => 42 @@ -140,8 +140,8 @@ INF => "INF" true => 1 false => 0 null => null -[] => Argument ... ($arg) to be of type string|int|null, array given -new stdClass => Argument ... ($arg) to be of type string|int|null, object given +[] => Argument ... must be of type string|int|null, array given +new stdClass => Argument ... must be of type string|int|null, object given new WithToString => "__toString()" Type string|bool: @@ -155,9 +155,9 @@ INF => "INF" "" => "" true => true false => false -null => Argument ... ($arg) to be of type string|bool, null given -[] => Argument ... ($arg) to be of type string|bool, array given -new stdClass => Argument ... ($arg) to be of type string|bool, object given +null => Argument ... must be of type string|bool, null given +[] => Argument ... must be of type string|bool, array given +new stdClass => Argument ... must be of type string|bool, object given new WithToString => "__toString()" Type float|array: @@ -167,14 +167,14 @@ INF => INF "42" => 42.0 "42.0" => 42.0 "42x" => 42.0 (A non well formed numeric value encountered) -"x" => Argument ... ($arg) to be of type array|float, string given -"" => Argument ... ($arg) to be of type array|float, string given +"x" => Argument ... must be of type array|float, string given +"" => Argument ... must be of type array|float, string given true => 1.0 false => 0.0 -null => Argument ... ($arg) to be of type array|float, null given +null => Argument ... must be of type array|float, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|float, object given -new WithToString => Argument ... ($arg) to be of type array|float, object given +new stdClass => Argument ... must be of type array|float, object given +new WithToString => Argument ... must be of type array|float, object given Type string|array: 42 => "42" @@ -187,9 +187,9 @@ INF => "INF" "" => "" true => "1" false => "" -null => Argument ... ($arg) to be of type array|string, null given +null => Argument ... must be of type array|string, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|string, object given +new stdClass => Argument ... must be of type array|string, object given new WithToString => "__toString()" Type bool|array: @@ -203,7 +203,7 @@ INF => true "" => false true => true false => false -null => Argument ... ($arg) to be of type array|bool, null given +null => Argument ... must be of type array|bool, null given [] => [] -new stdClass => Argument ... ($arg) to be of type array|bool, object given -new WithToString => Argument ... ($arg) to be of type array|bool, object given +new stdClass => Argument ... must be of type array|bool, object given +new WithToString => Argument ... must be of type array|bool, object given diff --git a/Zend/tests/type_declarations/weak_include_strict.phpt b/Zend/tests/type_declarations/weak_include_strict.phpt index 61f33818e2..9bf6c0a47f 100644 --- a/Zend/tests/type_declarations/weak_include_strict.phpt +++ b/Zend/tests/type_declarations/weak_include_strict.phpt @@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc'; // calls within that file should stay strict, despite being included by weak file ?> --EXPECTF-- -Fatal error: Uncaught TypeError: takes_int() expects argument #1 ($x) to be of type int, float given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: takes_int(): Argument #1 ($x) must be of type int, float given, called in %s:%d Stack trace: #0 %s(%d): takes_int(1) #1 %s(%d): require('%s') diff --git a/Zend/tests/typehints/or_null.phpt b/Zend/tests/typehints/or_null.phpt index 55714620c2..2d0683edbb 100644 --- a/Zend/tests/typehints/or_null.phpt +++ b/Zend/tests/typehints/or_null.phpt @@ -219,39 +219,39 @@ try { ?> --EXPECTF-- -TypeError: unloadedClass() expects argument #1 ($param) to be of type ?I\Dont\Exist, stdClass given, called in %s on line %d and defined in %s:%d +TypeError: unloadedClass(): Argument #1 ($param) must be of type ?I\Dont\Exist, stdClass given, called in %s:%d Stack trace: #0 %s(8): unloadedClass(Object(stdClass)) #1 {main} -TypeError: loadedClass() expects argument #1 ($param) to be of type ?RealClass, stdClass given, called in %s on line %d and defined in %s:%d +TypeError: loadedClass(): Argument #1 ($param) must be of type ?RealClass, stdClass given, called in %s:%d Stack trace: #0 %s(20): loadedClass(Object(stdClass)) #1 {main} -TypeError: loadedInterface() expects argument #1 ($param) to be of type ?RealInterface, stdClass given, called in %s on line %d and defined in %s:%d +TypeError: loadedInterface(): Argument #1 ($param) must be of type ?RealInterface, stdClass given, called in %s:%d Stack trace: #0 %s(26): loadedInterface(Object(stdClass)) #1 {main} -TypeError: unloadedClass() expects argument #1 ($param) to be of type ?I\Dont\Exist, int given, called in %s on line %d and defined in %s:%d +TypeError: unloadedClass(): Argument #1 ($param) must be of type ?I\Dont\Exist, int given, called in %s:%d Stack trace: #0 %s(32): unloadedClass(1) #1 {main} -TypeError: loadedClass() expects argument #1 ($param) to be of type ?RealClass, int given, called in %s on line %d and defined in %s:%d +TypeError: loadedClass(): Argument #1 ($param) must be of type ?RealClass, int given, called in %s:%d Stack trace: #0 %s(38): loadedClass(1) #1 {main} -TypeError: loadedInterface() expects argument #1 ($param) to be of type ?RealInterface, int given, called in %s on line %d and defined in %s:%d +TypeError: loadedInterface(): Argument #1 ($param) must be of type ?RealInterface, int given, called in %s:%d Stack trace: #0 %s(44): loadedInterface(1) #1 {main} -TypeError: callableF() expects argument #1 ($param) to be of type ?callable, int given, called in %s on line %d and defined in %s:%d +TypeError: callableF(): Argument #1 ($param) must be of type ?callable, int given, called in %s:%d Stack trace: #0 %s(52): callableF(1) #1 {main} -TypeError: iterableF() expects argument #1 ($param) to be of type ?iterable, int given, called in %s on line %d and defined in %s:%d +TypeError: iterableF(): Argument #1 ($param) must be of type ?iterable, int given, called in %s:%d Stack trace: #0 %s(60): iterableF(1) #1 {main} -TypeError: intF() expects argument #1 ($param) to be of type ?int, object given, called in %s on line %d and defined in %s:%d +TypeError: intF(): Argument #1 ($param) must be of type ?int, object given, called in %s:%d Stack trace: #0 %s(68): intF(Object(stdClass)) #1 {main} diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt index 712e21d3ac..3d92214cf3 100644 --- a/Zend/tests/variadic/typehint_error.phpt +++ b/Zend/tests/variadic/typehint_error.phpt @@ -33,7 +33,7 @@ array(3) { } } -Fatal error: Uncaught TypeError: test() expects argument #3 ($args) to be of type array, int given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: test(): Argument #3 ($args) must be of type array, int given, called in %s:%d Stack trace: #0 %s(%d): test(Array, Array, 2) #1 {main} diff --git a/Zend/tests/variadic/typehint_suppressed_error.phpt b/Zend/tests/variadic/typehint_suppressed_error.phpt index d1168f4025..8bec0389f8 100644 --- a/Zend/tests/variadic/typehint_suppressed_error.phpt +++ b/Zend/tests/variadic/typehint_suppressed_error.phpt @@ -15,4 +15,4 @@ try { ?> --EXPECTF-- -string(%d) "test() expects argument #3 ($args) to be of type array, int given, called in %s on line %d" +string(%d) "test(): Argument #3 ($args) must be of type array, int given, called in %s on line %d" diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a739303cf3..74afc47474 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -216,7 +216,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, z return; } - zend_argument_type_error(num, "to be %s, %s given", expected_error[expected_type], zend_zval_type_name(arg)); + zend_argument_type_error(num, "must be %s, %s given", expected_error[expected_type], zend_zval_type_name(arg)); } /* }}} */ @@ -226,7 +226,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, return; } - zend_argument_type_error(num, "to be of type %s, %s given", name, zend_zval_type_name(arg)); + zend_argument_type_error(num, "must be of type %s, %s given", name, zend_zval_type_name(arg)); } /* }}} */ @@ -236,7 +236,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *e return; } - zend_argument_type_error(num, "to be a valid callback, %s", error); + zend_argument_type_error(num, "must be a valid callback, %s", error); efree(error); } /* }}} */ @@ -259,9 +259,10 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *erro zend_vspprintf(&message, 0, format, va); va_end(va); - zend_throw_error(error_ce, "%s%s%s() expects argument #%d%s%s%s %s", - class_name, space, get_active_function_name(), arg_num, - arg_name ? " ($" : "", arg_name ? arg_name : "", arg_name ? ")" : "", message + zend_throw_error(error_ce, "%s%s%s(): Argument #%d%s%s%s %s", + class_name, space, get_active_function_name(), + arg_num, arg_name ? " ($" : "", arg_name ? arg_name : "", arg_name ? ")" : "", + message ); efree(message); } @@ -283,13 +284,13 @@ ZEND_API int ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **pc *pce = zend_lookup_class(Z_STR_P(arg)); if (ce_base) { if ((!*pce || !instanceof_function(*pce, ce_base))) { - zend_argument_type_error(num, "to be a class name derived from %s, '%s' given", ZSTR_VAL(ce_base->name), Z_STRVAL_P(arg)); + zend_argument_type_error(num, "must be a class name derived from %s, '%s' given", ZSTR_VAL(ce_base->name), Z_STRVAL_P(arg)); *pce = NULL; return 0; } } if (!*pce) { - zend_argument_type_error(num, "to be a valid class name, '%s' given", Z_STRVAL_P(arg)); + zend_argument_type_error(num, "must be a valid class name, '%s' given", Z_STRVAL_P(arg)); return 0; } return 1; @@ -745,10 +746,10 @@ static int zend_parse_arg(int arg_num, zval *arg, va_list *va, const char **spec } if (!(flags & ZEND_PARSE_PARAMS_QUIET) && (*expected_type || error)) { if (error) { - zend_argument_type_error(arg_num, "to be %s", error); + zend_argument_type_error(arg_num, "must be %s", error); efree(error); } else { - zend_argument_type_error(arg_num, "to be of type %s, %s given", expected_type, zend_zval_type_name(arg)); + zend_argument_type_error(arg_num, "must be of type %s, %s given", expected_type, zend_zval_type_name(arg)); } } else if (error) { efree(error); diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 96a6b21ae2..66cf80d64b 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1388,7 +1388,7 @@ ZEND_FUNCTION(set_error_handler) if (Z_TYPE_P(error_handler) != IS_NULL) { /* NULL == unset */ if (!zend_is_callable(error_handler, 0, NULL)) { zend_string *error_handler_name = zend_get_callable_name(error_handler); - zend_error(E_WARNING, "%s() expects argument #1 ($error_handler) to be a valid callback", get_active_function_name()); + zend_error(E_WARNING, "%s(): Argument #1 ($error_handler) must be a valid callback", get_active_function_name()); zend_string_release_ex(error_handler_name, 0); return; } @@ -1452,7 +1452,7 @@ ZEND_FUNCTION(set_exception_handler) if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */ if (!zend_is_callable(exception_handler, 0, NULL)) { zend_string *exception_handler_name = zend_get_callable_name(exception_handler); - zend_error(E_WARNING, "%s() expects argument #1 ($exception_handler) to be a valid callback", get_active_function_name()); + zend_error(E_WARNING, "%s(): Argument #1 ($exception_handler) must be a valid callback", get_active_function_name()); zend_string_release_ex(exception_handler_name, 0); return; } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index b851439e39..f550614130 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -692,16 +692,21 @@ ZEND_API ZEND_COLD void zend_verify_arg_error( if (zf->common.type == ZEND_USER_FUNCTION) { if (ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given, called in %s on line %d", - fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg, - ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given, called in %s on line %d", + fclass, fsep, fname, + arg_num, ZSTR_VAL(arg_info->name), + ZSTR_VAL(need_msg), given_msg, + ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno + ); } else { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given", - fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given", + fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg + ); } } else { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given", - fclass, fsep, fname, arg_num, ((zend_internal_arg_info*) arg_info)->name, ZSTR_VAL(need_msg), given_msg); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given", + fclass, fsep, fname, arg_num, ((zend_internal_arg_info*) arg_info)->name, ZSTR_VAL(need_msg), given_msg + ); } zend_string_release(need_msg); @@ -1925,7 +1930,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_param_must_be_ref(con { const char *arg_name = get_function_arg_name(func, arg_num); - zend_error(E_WARNING, "%s%s%s() expects argument #%d%s%s%s to be passed by reference, value given", + zend_error(E_WARNING, "%s%s%s(): Argument #%d%s%s%s must be passed by reference, value given", func->common.scope ? ZSTR_VAL(func->common.scope->name) : "", func->common.scope ? "::" : "", ZSTR_VAL(func->common.function_name), @@ -2550,8 +2555,9 @@ static ZEND_COLD void ZEND_FASTCALL zend_array_key_exists_error( ZVAL_UNDEFINED_OP2(); } if (!EG(exception)) { - zend_type_error("array_key_exists() expects argument #2 ($array) to be of type array, %s given", - zend_get_type_by_const(Z_TYPE_P(subject))); + zend_type_error("array_key_exists(): Argument #2 ($array) must be of type array, %s given", + zend_get_type_by_const(Z_TYPE_P(subject)) + ); } } diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 80d0cf26ee..514c40ec1b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -751,7 +751,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / const char *arg_name = get_function_arg_name(func, i + 1); zend_error(E_WARNING, - "%s%s%s() expects argument #%d%s%s%s to be passed by reference, value given", + "%s%s%s(): Argument #%d%s%s%s must be passed by reference, value given", func->common.scope ? ZSTR_VAL(func->common.scope->name) : "", func->common.scope ? "::" : "", ZSTR_VAL(func->common.function_name), diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 7f0de717a4..bf5a156389 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3775,7 +3775,7 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s() expects argument #1 ($function) to be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); FREE_OP2(); HANDLE_EXCEPTION(); @@ -4938,7 +4938,7 @@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY, NUM) ZEND_VM_C_GOTO(send_array); } } - zend_type_error("call_user_func_array() expects argument #2 ($args) to be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args))); + zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args))); FREE_UNFETCHED_OP2(); FREE_OP1(); HANDLE_EXCEPTION(); @@ -7909,7 +7909,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY) zval_ptr_dtor(&tmp); } if (!EG(exception)) { - zend_type_error("strlen() expects argument #1 ($str) to be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); + zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); } ZVAL_UNDEF(EX_VAR(opline->result.var)); } while (0); @@ -8517,7 +8517,7 @@ ZEND_VM_COLD_CONST_HANDLER(191, ZEND_GET_CLASS, UNUSED|CONST|TMPVAR|CV, UNUSED) if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - zend_type_error("get_class() expects argument #1 ($object) to be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); + zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } break; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c9bb201131..c87df4e871 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1981,7 +1981,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_O goto send_array; } } - zend_type_error("call_user_func_array() expects argument #2 ($args) to be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args))); + zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args))); FREE_UNFETCHED_OP(opline->op2_type, opline->op2.var); FREE_OP(opline->op1_type, opline->op1.var); HANDLE_EXCEPTION(); @@ -4464,7 +4464,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST zval_ptr_dtor(&tmp); } if (!EG(exception)) { - zend_type_error("strlen() expects argument #1 ($str) to be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); + zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); } ZVAL_UNDEF(EX_VAR(opline->result.var)); } while (0); @@ -5889,7 +5889,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s() expects argument #1 ($function) to be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); HANDLE_EXCEPTION(); @@ -8065,7 +8065,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s() expects argument #1 ($function) to be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); HANDLE_EXCEPTION(); @@ -9333,7 +9333,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CO if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - zend_type_error("get_class() expects argument #1 ($object) to be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); + zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } break; @@ -10320,7 +10320,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s() expects argument #1 ($function) to be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); HANDLE_EXCEPTION(); @@ -13305,7 +13305,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN zval_ptr_dtor(&tmp); } if (!EG(exception)) { - zend_type_error("strlen() expects argument #1 ($str) to be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); + zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); } ZVAL_UNDEF(EX_VAR(opline->result.var)); } while (0); @@ -16412,7 +16412,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_TMPVAR_UNUSED_H if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - zend_type_error("get_class() expects argument #1 ($object) to be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); + zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } break; @@ -33308,7 +33308,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_UNUSED_UNUSED_H if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - zend_type_error("get_class() expects argument 1 ($object) to be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); + zend_type_error("Argument 1 ($object) passed to get_class() must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } break; @@ -36702,7 +36702,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP zval_ptr_dtor(&tmp); } if (!EG(exception)) { - zend_type_error("strlen() expects argument #1 ($str) to be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); + zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value))); } ZVAL_UNDEF(EX_VAR(opline->result.var)); } while (0); @@ -45260,7 +45260,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CV_UNUSED_HANDL if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - zend_type_error("get_class() expects argument #1 ($object) to be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); + zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } break; diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt index e6a76e7afa..62a6002f39 100644 --- a/ext/curl/tests/curl_setopt_error.phpt +++ b/ext/curl/tests/curl_setopt_error.phpt @@ -20,6 +20,6 @@ curl_setopt($ch, -10, 0); ?> --EXPECTF-- *** curl_setopt() call with incorrect parameters -curl_setopt() expects argument #2 ($option) to be of type int, string given +curl_setopt(): Argument #2 ($option) must be of type int, string given Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index ce346c2ba9..a2f81090e7 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() expects argument #1 ($object) to be of type DateTimeZone, object given in %s:%d +Fatal error: Uncaught TypeError: timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, object given in %s:%d Stack trace: #0 %s(%d): timezone_offset_get(Object(DateTime), Object(DateTimeZone)) #1 {main} diff --git a/ext/date/tests/68062.phpt b/ext/date/tests/68062.phpt index 63e40a3bd0..2a7c6ad61a 100644 --- a/ext/date/tests/68062.phpt +++ b/ext/date/tests/68062.phpt @@ -14,4 +14,4 @@ try { } --EXPECT-- 3600 -DateTimeZone::getOffset() expects argument #1 ($datetime) to be of type DateTimeInterface, int given +DateTimeZone::getOffset(): Argument #1 ($datetime) must be of type DateTimeInterface, int given diff --git a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt index 8651a90d34..3ac17de49f 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() expects argument #1 ($object) to be of type DateTime, object given +DateTimeImmutable::createFromMutable(): Argument #1 ($object) must be of type DateTime, object given diff --git a/ext/date/tests/DateTime_createFromImmutable.phpt b/ext/date/tests/DateTime_createFromImmutable.phpt index 153e7f3cbf..6407333f06 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() expects argument #1 ($object) to be of type DateTimeImmutable, object given +DateTime::createFromImmutable(): Argument #1 ($object) must be of type DateTimeImmutable, object given diff --git a/ext/date/tests/bug36988.phpt b/ext/date/tests/bug36988.phpt index ecb6e8ad7a..275dc80a0d 100644 --- a/ext/date/tests/bug36988.phpt +++ b/ext/date/tests/bug36988.phpt @@ -13,4 +13,4 @@ try { } ?> --EXPECT-- -mktime() expects argument #6 ($year) to be of type int, float given +mktime(): Argument #6 ($year) must be of type int, float given diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt index 639868aecb..de2936c853 100644 --- a/ext/date/tests/bug52062.phpt +++ b/ext/date/tests/bug52062.phpt @@ -28,7 +28,7 @@ var_dump($i->format('%s')); string(32) "5138-11-16 09:46:40 100000000000" bool(false) string(12) "100000000000" -DateTime::setTimestamp() expects argument #1 ($timestamp) to be of type int, float given +DateTime::setTimestamp(): Argument #1 ($timestamp) must be of type int, float given string(32) "5138-11-16 09:46:40 100000000000" bool(false) string(10) "1215752192" diff --git a/ext/date/tests/bug70245.phpt b/ext/date/tests/bug70245.phpt index 2443d91d01..9fd566de9a 100644 --- a/ext/date/tests/bug70245.phpt +++ b/ext/date/tests/bug70245.phpt @@ -10,4 +10,4 @@ try { } ?> --EXPECT-- -strtotime() expects argument #2 ($now) to be of type int, object given +strtotime(): Argument #2 ($now) must be of type int, object given diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt index d746e5b3ac..9ab11355e8 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -47,11 +47,11 @@ float(%s) int(0) } } -microtime() expects argument #1 ($get_as_float) to be of type bool, array given +microtime(): Argument #1 ($get_as_float) must be of type bool, array given --> bad arg: object(stdClass)#%d (0) { } -microtime() expects argument #1 ($get_as_float) to be of type bool, object given +microtime(): Argument #1 ($get_as_float) must be of type bool, object 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 1782ced195..864dc54c2a 100644 --- a/ext/date/tests/timezone_offset_get_error.phpt +++ b/ext/date/tests/timezone_offset_get_error.phpt @@ -65,16 +65,16 @@ try { *** Testing timezone_offset_get() : error conditions *** -- Testing timezone_offset_get() function with an invalid values for $object argument -- -string(92) "timezone_offset_get() expects argument #1 ($object) to be of type DateTimeZone, object given" +string(87) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, object given" -string(89) "timezone_offset_get() expects argument #1 ($object) to be of type DateTimeZone, int given" +string(84) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, int given" -string(90) "timezone_offset_get() expects argument #1 ($object) to be of type DateTimeZone, null given" +string(85) "timezone_offset_get(): Argument #1 ($object) must be of type DateTimeZone, null given" -- Testing timezone_offset_get() function with an invalid values for $datetime argument -- -string(99) "timezone_offset_get() expects argument #2 ($datetime) to be of type DateTimeInterface, object given" +string(94) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, object given" -string(96) "timezone_offset_get() expects argument #2 ($datetime) to be of type DateTimeInterface, int given" +string(91) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, int given" -string(97) "timezone_offset_get() expects argument #2 ($datetime) to be of type DateTimeInterface, null given" +string(92) "timezone_offset_get(): Argument #2 ($datetime) must be of type DateTimeInterface, null given" diff --git a/ext/ffi/tests/045.phpt b/ext/ffi/tests/045.phpt index 411a03702b..7503fb763b 100644 --- a/ext/ffi/tests/045.phpt +++ b/ext/ffi/tests/045.phpt @@ -23,5 +23,5 @@ try { --EXPECTF-- bool(true) bool(false) -TypeError: FFI::isNull() expects argument #1 ($ptr) to be of type FFI\CData, null given +TypeError: FFI::isNull(): Argument #1 ($ptr) must be of type FFI\CData, null given FFI\Exception: Cannot instantiate FFI\CData of zero size diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt index 2ceb80444c..7099897142 100644 --- a/ext/fileinfo/tests/finfo_open_001.phpt +++ b/ext/fileinfo/tests/finfo_open_001.phpt @@ -19,7 +19,7 @@ var_dump(finfo_open(FILEINFO_MIME, '/foo/bar/inexistent')); ?> --EXPECTF-- -finfo_open() expects argument #2 ($arg) to be a valid path, string given +finfo_open(): Argument #2 ($arg) must be a valid path, string given resource(%d) of type (file_info) resource(%d) of type (file_info) diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index 6e0c02c489..72b6db3e62 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -42,5 +42,5 @@ bool(false) Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_open_error.php on line %d resource(6) of type (file_info) -finfo_open() expects argument #1 ($options) to be of type int, string given -finfo::__construct() expects argument #1 ($options) to be of type int, string given +finfo_open(): Argument #1 ($options) must be of type int, string given +finfo::__construct(): Argument #1 ($options) must be of type int, string given diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt index 775da28b7f..eda6cfed42 100644 --- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt +++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECT-- -imagegd() expects argument #2 ($to) to be a valid path, string given +imagegd(): Argument #2 ($to) must be a valid path, string given diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt index e9d0af3c93..d10e7dc31b 100644 --- a/ext/gd/tests/imagegd_nullbyte_injection.phpt +++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECT-- -imagegd() expects argument #2 ($to) to be a valid path, string given +imagegd(): Argument #2 ($to) must be a valid path, string given diff --git a/ext/gd/tests/imagexbm_nullbyte_injection.phpt b/ext/gd/tests/imagexbm_nullbyte_injection.phpt index a84bc78eeb..7a24ebf816 100644 --- a/ext/gd/tests/imagexbm_nullbyte_injection.phpt +++ b/ext/gd/tests/imagexbm_nullbyte_injection.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECTF-- -imagexbm() expects argument #2 ($filename) to be a valid path, string given +imagexbm(): Argument #2 ($filename) must be a valid path, string given diff --git a/ext/gmp/tests/gmp_clrbit.phpt b/ext/gmp/tests/gmp_clrbit.phpt index 5169cc7986..491ef79bfc 100644 --- a/ext/gmp/tests/gmp_clrbit.phpt +++ b/ext/gmp/tests/gmp_clrbit.phpt @@ -47,5 +47,5 @@ Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line string(7) "1000000" string(7) "1000000" string(30) "238462734628347239571822592658" -gmp_clrbit() expects argument #1 ($a) to be of type GMP, array given +gmp_clrbit(): Argument #1 ($a) must be of type GMP, array given Done diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt index afa8cc13e9..449f668667 100644 --- a/ext/gmp/tests/gmp_pow.phpt +++ b/ext/gmp/tests/gmp_pow.phpt @@ -47,7 +47,7 @@ Warning: gmp_pow(): Negative exponent not supported in %s on line %d string(1) "0" string(14) "10240000000000" string(14) "10240000000000" -gmp_pow() expects argument #2 ($exp) to be of type int, array given +gmp_pow(): Argument #2 ($exp) must be of type int, array given Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_setbit.phpt b/ext/gmp/tests/gmp_setbit.phpt index 30d9021247..b883060e54 100644 --- a/ext/gmp/tests/gmp_setbit.phpt +++ b/ext/gmp/tests/gmp_setbit.phpt @@ -57,6 +57,6 @@ string(1) "7" string(12) "100008388608" string(12) "100000000000" string(12) "100000000008" -gmp_setbit() expects argument #1 ($a) to be of type GMP, string given -gmp_setbit() expects argument #1 ($a) to be of type GMP, array given +gmp_setbit(): Argument #1 ($a) must be of type GMP, string given +gmp_setbit(): Argument #1 ($a) must be of type GMP, array given Done diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt index 3b6686a68d..b27038093c 100644 --- a/ext/imap/tests/imap_expunge_error.phpt +++ b/ext/imap/tests/imap_expunge_error.phpt @@ -22,6 +22,6 @@ Checking with no parameters Warning: imap_num_recent() expects exactly 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_num_recent() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_num_recent(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_num_recent() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_num_recent(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt index e3c05c6855..2d825ce1fd 100644 --- a/ext/imap/tests/imap_gc_error.phpt +++ b/ext/imap/tests/imap_gc_error.phpt @@ -28,8 +28,8 @@ Checking with no parameters Warning: imap_gc() Expects exactly 2 parameters, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_gc() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_gc(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_gc() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_gc(): Argument #1 must be of type resource, bool given in %s on line %d Warning: imap_gc(): Invalid value for the flags parameter in %s on line %d diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt index 73c0c52306..1ff30bfc10 100644 --- a/ext/imap/tests/imap_headers.phpt +++ b/ext/imap/tests/imap_headers.phpt @@ -22,6 +22,6 @@ Checking with no parameters Warning: imap_headers() expects exactly 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_headers() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_headers(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_headers() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_headers(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt index e6a5650e6d..28a727ddb2 100644 --- a/ext/imap/tests/imap_num_msg_error.phpt +++ b/ext/imap/tests/imap_num_msg_error.phpt @@ -22,6 +22,6 @@ Checking with no parameters Warning: imap_num_msg() expects exactly 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_num_msg() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_num_msg(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_num_msg() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_num_msg(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/imap/tests/imap_num_recent_error.phpt b/ext/imap/tests/imap_num_recent_error.phpt index 4f4fef5054..0bb877c76d 100644 --- a/ext/imap/tests/imap_num_recent_error.phpt +++ b/ext/imap/tests/imap_num_recent_error.phpt @@ -22,6 +22,6 @@ Checking with no parameters Warning: imap_expunge() expects exactly 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_expunge() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_expunge(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_expunge() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_expunge(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/imap/tests/imap_ping_error.phpt b/ext/imap/tests/imap_ping_error.phpt index 918407ac06..2aedcbddd5 100644 --- a/ext/imap/tests/imap_ping_error.phpt +++ b/ext/imap/tests/imap_ping_error.phpt @@ -22,6 +22,6 @@ Checking with no parameters Warning: imap_ping() expects exactly 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_ping() expects argument #1 to be of type resource, string given in %s on line %d +Warning: imap_ping(): Argument #1 must be of type resource, string given in %s on line %d -Warning: imap_ping() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: imap_ping(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt index 7b83309ef7..afe1d2d081 100644 --- a/ext/imap/tests/imap_timeout_basic.phpt +++ b/ext/imap/tests/imap_timeout_basic.phpt @@ -44,7 +44,7 @@ Checking with no parameters Warning: imap_timeout() expects at least 1 parameter, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_timeout() expects argument #1 to be of type int, %s given in %s on line %d +Warning: imap_timeout(): Argument #1 must be of type int, %s given in %s on line %d GET values: int(%d) int(%d) diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt index 35a145dcec..c8cbdcc6de 100644 --- a/ext/intl/tests/breakiter___construct_error.phpt +++ b/ext/intl/tests/breakiter___construct_error.phpt @@ -43,6 +43,6 @@ Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 paramete Exception: IntlRuleBasedBreakIterator::__construct() expects at most 2 parameters, 3 given in %s on line %d -Exception: IntlRuleBasedBreakIterator::__construct() expects argument #2 ($areCompiled) to be of type bool, array given in %s on line %d +Exception: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($areCompiled) must be of type bool, array given in %s on line %d Exception: IntlRuleBasedBreakIterator::__construct(): rbbi_create_instance: unable to create instance from compiled rules in %s on line %d diff --git a/ext/intl/tests/bug48227.phpt b/ext/intl/tests/bug48227.phpt index 28a614da03..9635b70906 100644 --- a/ext/intl/tests/bug48227.phpt +++ b/ext/intl/tests/bug48227.phpt @@ -16,7 +16,7 @@ foreach (['', 1, NULL, $x] as $value) { ?> --EXPECT-- -NumberFormatter::format() expects argument #1 ($value) to be of type number, string given +NumberFormatter::format(): Argument #1 ($value) must be of type number, string given string(1) "1" string(1) "0" -NumberFormatter::format() expects argument #1 ($value) to be of type number, object given +NumberFormatter::format(): Argument #1 ($value) must be of type number, object given diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt index e30ed02856..59b9abc053 100644 --- a/ext/intl/tests/calendar_add_error.phpt +++ b/ext/intl/tests/calendar_add_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_add(1, 2, 3)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_add() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_add(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_add(1, 2, 3) #1 {main} diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt index a9bbed25e6..8fd6db2a1b 100644 --- a/ext/intl/tests/calendar_before_after_error.phpt +++ b/ext/intl/tests/calendar_before_after_error.phpt @@ -65,9 +65,9 @@ error: 0, IntlCalendar::after() expects exactly 1 parameter, 0 given error: 0, IntlCalendar::before() expects exactly 1 parameter, 0 given -error: 0, IntlCalendar::after() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, IntlCalendar::after(): Argument #1 ($calendar) must be of type IntlCalendar, int given -error: 0, IntlCalendar::before() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, IntlCalendar::before(): Argument #1 ($calendar) must be of type IntlCalendar, int given error: 0, IntlCalendar::after() expects exactly 1 parameter, 2 given diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt index c56f9065fc..dd2c1e0e75 100644 --- a/ext/intl/tests/calendar_clear_error.phpt +++ b/ext/intl/tests/calendar_clear_error.phpt @@ -23,7 +23,7 @@ bool(false) Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_clear() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_clear(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_clear(1, 2) #1 {main} diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt index 0d4665af60..9da547fe5a 100644 --- a/ext/intl/tests/calendar_equals_error.phpt +++ b/ext/intl/tests/calendar_equals_error.phpt @@ -47,10 +47,10 @@ try { --EXPECT-- error: 0, IntlCalendar::equals() expects exactly 1 parameter, 0 given -error: 0, IntlCalendar::equals() expects argument #1 ($calendar) to be of type IntlCalendar, object given +error: 0, IntlCalendar::equals(): Argument #1 ($calendar) must be of type IntlCalendar, object given error: 0, IntlCalendar::equals() expects exactly 1 parameter, 2 given -error: 0, intlcal_equals() expects argument #2 ($calendar) to be of type IntlCalendar, array given +error: 0, intlcal_equals(): Argument #2 ($calendar) must be of type IntlCalendar, array given -error: 0, intlcal_equals() expects argument #1 ($calendarObject) to be of type IntlCalendar, int given +error: 0, intlcal_equals(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt index 872fea825d..bf9ab18c76 100644 --- a/ext/intl/tests/calendar_fieldDifference_error.phpt +++ b/ext/intl/tests/calendar_fieldDifference_error.phpt @@ -32,7 +32,7 @@ Warning: IntlCalendar::fieldDifference(): intlcal_field_difference: Call to ICU bool(false) intlcal_field_difference() expects exactly 3 parameters, 4 given -Fatal error: Uncaught TypeError: intlcal_field_difference() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_field_difference(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_field_difference(1, 0, 1) #1 {main} diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt index 644e580f11..5408f966e2 100644 --- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt +++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt @@ -19,7 +19,7 @@ var_dump(intlcal_get_day_of_week_type(1, 1)); Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: invalid day of week in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_get_day_of_week_type() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_day_of_week_type(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_day_of_week_type(1, 1) #1 {main} diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt index 4d69bdedfd..5bf65b59c5 100644 --- a/ext/intl/tests/calendar_getErrorCode_error.phpt +++ b/ext/intl/tests/calendar_getErrorCode_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_error_code(null)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_error_code() expects argument #1 ($calendar) to be of type IntlCalendar, null given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_error_code(): Argument #1 ($calendar) must be of type IntlCalendar, null given in %s:%d Stack trace: #0 %s(%d): intlcal_get_error_code(NULL) #1 {main} diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt index 68b1ad1d6c..733194fee9 100644 --- a/ext/intl/tests/calendar_getErrorMessage_error.phpt +++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_error_message(null)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_error_message() expects argument #1 ($calendar) to be of type IntlCalendar, null given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_error_message(): Argument #1 ($calendar) must be of type IntlCalendar, null given in %s:%d Stack trace: #0 %s(%d): intlcal_get_error_message(NULL) #1 {main} diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt index 22de5dadcd..fa37edd380 100644 --- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_first_day_of_week(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_first_day_of_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_first_day_of_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_first_day_of_week(1) #1 {main} diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt index 644a7eab1c..9a84ac9719 100644 --- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_minimal_days_in_first_week(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_minimal_days_in_first_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_minimal_days_in_first_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_minimal_days_in_first_week(1) #1 {main} diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt index b49861ba49..3c8082d62b 100644 --- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_skipped_wall_time_option(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_skipped_wall_time_option() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_skipped_wall_time_option(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_skipped_wall_time_option(1) #1 {main} diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt index be9585a821..11bc5631c8 100644 --- a/ext/intl/tests/calendar_getTimeZone_error.phpt +++ b/ext/intl/tests/calendar_getTimeZone_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_time_zone(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_time_zone() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_time_zone(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_time_zone(1) #1 {main} diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt index 6c917103cb..6018cd7c92 100644 --- a/ext/intl/tests/calendar_getTime_error.phpt +++ b/ext/intl/tests/calendar_getTime_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_time(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_time(1) #1 {main} diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt index f623bd3e8b..83bf072508 100644 --- a/ext/intl/tests/calendar_getType_error.phpt +++ b/ext/intl/tests/calendar_getType_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_type(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_get_type() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_type(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_type(1) #1 {main} diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt index b9d7f30299..3be22cfc9c 100644 --- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt +++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt @@ -18,7 +18,7 @@ var_dump(intlcal_get_weekend_transition(1, 1)); Warning: IntlCalendar::getWeekendTransition(): intlcal_get_weekend_transition: invalid day of week in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_get_weekend_transition() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_get_weekend_transition(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_get_weekend_transition(1, 1) #1 {main} diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt index 7392294b96..318738f094 100644 --- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt +++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt @@ -71,10 +71,10 @@ bool(false) Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d bool(false) -error: 0, intlcal_get_least_maximum() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_get_least_maximum(): Argument #1 ($calendar) must be of type IntlCalendar, int given -error: 0, intlcal_get_maximum() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_get_maximum(): Argument #1 ($calendar) must be of type IntlCalendar, int given -error: 0, intlcal_get_greatest_minimum() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_get_greatest_minimum(): Argument #1 ($calendar) must be of type IntlCalendar, int given -error: 0, intlcal_get_minimum() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_get_minimum(): Argument #1 ($calendar) must be of type IntlCalendar, int given diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt index 5fe75fe17a..207d9e5cdb 100644 --- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt +++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt @@ -93,11 +93,11 @@ error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: invalid fiel bool(false) error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: invalid field bool(false) -error: 0, intlcal_get() expects argument #2 ($field) to be of type int, string given +error: 0, intlcal_get(): Argument #2 ($field) must be of type int, string given -error: 0, intlcal_get_actual_maximum() expects argument #2 ($field) to be of type int, string given +error: 0, intlcal_get_actual_maximum(): Argument #2 ($field) must be of type int, string given -error: 0, intlcal_get_actual_minimum() expects argument #2 ($field) to be of type int, string given +error: 0, intlcal_get_actual_minimum(): Argument #2 ($field) must be of type int, string given error: 0, intlcal_get() expects exactly 2 parameters, 1 given diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt index fb4492cb08..4b6d88aa4c 100644 --- a/ext/intl/tests/calendar_inDaylightTime_error.phpt +++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_in_daylight_time(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_in_daylight_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_in_daylight_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_in_daylight_time(1) #1 {main} diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt index 4acb3b6143..a801bba952 100644 --- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt +++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt @@ -49,14 +49,14 @@ try { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } --EXPECT-- -error: 0, IntlCalendar::isEquivalentTo() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given error: 0, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given -error: 0, IntlCalendar::isEquivalentTo() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given error: 0, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given -error: 0, intlcal_is_equivalent_to() expects argument #2 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_is_equivalent_to(): Argument #2 ($calendar) must be of type IntlCalendar, int given -error: 0, intlcal_is_equivalent_to() expects argument #1 ($calendarObject) to be of type IntlCalendar, int given +error: 0, intlcal_is_equivalent_to(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt index 9e4a573908..dafefcc640 100644 --- a/ext/intl/tests/calendar_isLenient_error.phpt +++ b/ext/intl/tests/calendar_isLenient_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_is_lenient(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_is_lenient() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_is_lenient(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_is_lenient(1) #1 {main} diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt index 905e7c082d..969a5130a5 100644 --- a/ext/intl/tests/calendar_isSet_error.phpt +++ b/ext/intl/tests/calendar_isSet_error.phpt @@ -19,7 +19,7 @@ var_dump(intlcal_is_set(1, 2)); Warning: IntlCalendar::isSet(): intlcal_is_set: invalid field in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_is_set() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_is_set(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_is_set(1, 2) #1 {main} diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt index 138939d61e..aed66aefda 100644 --- a/ext/intl/tests/calendar_isWeekend_error.phpt +++ b/ext/intl/tests/calendar_isWeekend_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_is_weekend(1)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_is_weekend() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_is_weekend(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_is_weekend(1) #1 {main} diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt index e37c6d24b2..de110a864c 100644 --- a/ext/intl/tests/calendar_roll_error.phpt +++ b/ext/intl/tests/calendar_roll_error.phpt @@ -19,7 +19,7 @@ var_dump(intlcal_roll(1, 2, 3)); Warning: IntlCalendar::roll(): intlcal_roll: invalid field in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_roll() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_roll(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_roll(1, 2, 3) #1 {main} diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt index abaad15708..163e41fe48 100644 --- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt @@ -23,7 +23,7 @@ bool(false) Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_set_first_day_of_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_set_first_day_of_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_set_first_day_of_week(1, 2) #1 {main} diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt index 7e16004dc2..4dadb15c9f 100644 --- a/ext/intl/tests/calendar_setLenient_error.phpt +++ b/ext/intl/tests/calendar_setLenient_error.phpt @@ -12,7 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_set_lenient(1, false)); --EXPECTF-- -Fatal error: Uncaught TypeError: intlcal_set_lenient() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_set_lenient(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_set_lenient(1, false) #1 {main} diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt index 1973018628..c1b1a944fb 100644 --- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt @@ -23,7 +23,7 @@ bool(false) Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_set_minimal_days_in_first_week() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_set_minimal_days_in_first_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2) #1 {main} diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt index 795d5d56f9..c89e502e7a 100644 --- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt @@ -23,7 +23,7 @@ bool(false) Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: invalid option in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_set_repeated_wall_time_option() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_set_repeated_wall_time_option(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1) #1 {main} diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt index e8204c0d9f..722b876ec3 100644 --- a/ext/intl/tests/calendar_setTimeZone_error.phpt +++ b/ext/intl/tests/calendar_setTimeZone_error.phpt @@ -47,4 +47,4 @@ error: 0, IntlCalendar::setTimeZone() expects exactly 1 parameter, 0 given error: 0, intlcal_set_time_zone() expects exactly 2 parameters, 3 given -error: 0, intlcal_set_time_zone() expects argument #1 ($calendar) to be of type IntlCalendar, int given +error: 0, intlcal_set_time_zone(): Argument #1 ($calendar) must be of type IntlCalendar, int given diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt index 397deb48da..2113353604 100644 --- a/ext/intl/tests/calendar_set_error.phpt +++ b/ext/intl/tests/calendar_set_error.phpt @@ -38,7 +38,7 @@ bool(false) Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intlcal_set() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_set(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_set(1, 2, 3) #1 {main} diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt index e6ed8faf9c..20f45ef6d2 100644 --- a/ext/intl/tests/calendar_toDateTime_error.phpt +++ b/ext/intl/tests/calendar_toDateTime_error.phpt @@ -21,7 +21,7 @@ var_dump(intlcal_to_date_time(3)); Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)" -Fatal error: Uncaught TypeError: intlcal_to_date_time() expects argument #1 ($calendar) to be of type IntlCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlcal_to_date_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlcal_to_date_time(3) #1 {main} diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt index 8103f1f1a3..3201c9a82b 100644 --- a/ext/intl/tests/formatter_fail.phpt +++ b/ext/intl/tests/formatter_fail.phpt @@ -100,13 +100,13 @@ IntlException: Constructor failed in %s on line %d 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' -TypeError: NumberFormatter::__construct() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: NumberFormatter::__construct(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' -TypeError: NumberFormatter::create() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: NumberFormatter::create(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' -TypeError: numfmt_create() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: numfmt_create(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' IntlException: Constructor failed in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt index 83de556587..1f8d90b518 100644 --- a/ext/intl/tests/gregoriancalendar___construct_error.phpt +++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt @@ -38,4 +38,4 @@ Too many arguments Too many arguments No variant with 4 arguments (excluding trailing NULLs) No variant with 4 arguments (excluding trailing NULLs) -IntlGregorianCalendar::__construct() expects argument #6 to be of type int, array given +IntlGregorianCalendar::__construct(): Argument #6 must be of type int, array given diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt index 2caa055388..3fe4faf464 100644 --- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt +++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt @@ -14,7 +14,7 @@ var_dump(intlgregcal_get_gregorian_change(1)); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intlgregcal_get_gregorian_change() expects argument #1 ($calendar) to be of type IntlGregorianCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlgregcal_get_gregorian_change(): Argument #1 ($calendar) must be of type IntlGregorianCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlgregcal_get_gregorian_change(1) #1 {main} diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt index 6223256def..9cee3881f3 100644 --- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt +++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt @@ -14,7 +14,7 @@ var_dump(intlgregcal_is_leap_year(1, 2)); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intlgregcal_is_leap_year() expects argument #1 ($calendar) to be of type IntlGregorianCalendar, int given in %s:%d +Fatal error: Uncaught TypeError: intlgregcal_is_leap_year(): Argument #1 ($calendar) must be of type IntlGregorianCalendar, int given in %s:%d Stack trace: #0 %s(%d): intlgregcal_is_leap_year(1, 2) #1 {main} diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt index c02fcb35c3..b53e70e8ea 100644 --- a/ext/intl/tests/msgfmt_fail2.phpt +++ b/ext/intl/tests/msgfmt_fail2.phpt @@ -136,13 +136,13 @@ IntlException: Constructor failed in %s on line %d 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' -TypeError: MessageFormatter::__construct() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: MessageFormatter::__construct(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' -TypeError: MessageFormatter::create() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: MessageFormatter::create(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' -TypeError: msgfmt_create() expects argument #1 ($locale) to be of type string, array given in %s on line %d +TypeError: msgfmt_create(): Argument #1 ($locale) must be of type string, array given in %s on line %d 'U_ZERO_ERROR' IntlException: Constructor failed in %s on line %d diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt index e5802d1ef4..fe59f3cae4 100644 --- a/ext/intl/tests/timezone_getDSTSavings_error.phpt +++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intltz_get_dst_savings(null)); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_get_dst_savings() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_dst_savings(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_dst_savings(NULL) #1 {main} diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt index 7861f25fe6..0a76fcf1e9 100644 --- a/ext/intl/tests/timezone_getDisplayName_error.phpt +++ b/ext/intl/tests/timezone_getDisplayName_error.phpt @@ -16,7 +16,7 @@ var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_P Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: wrong display type in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intltz_get_display_name() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_display_name(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_display_name(NULL, 1, false, 'pt_PT') #1 {main} diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt index 91d0167b8a..c20e3c666a 100644 --- a/ext/intl/tests/timezone_getErrorCode_error.phpt +++ b/ext/intl/tests/timezone_getErrorCode_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intltz_get_error_code(null)); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_get_error_code() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_error_code(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_error_code(NULL) #1 {main} diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt index d492a956ea..9cd26d4f45 100644 --- a/ext/intl/tests/timezone_getErrorMessage_error.phpt +++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intltz_get_error_message(null)); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_get_error_message() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_error_message(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_error_message(NULL) #1 {main} diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt index 23c4cd1726..da79d7c1bb 100644 --- a/ext/intl/tests/timezone_getID_error.phpt +++ b/ext/intl/tests/timezone_getID_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); intltz_get_id(null); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_get_id() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_id(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_id(NULL) #1 {main} diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt index d9715b4998..639b690595 100644 --- a/ext/intl/tests/timezone_getOffset_error.phpt +++ b/ext/intl/tests/timezone_getOffset_error.phpt @@ -23,7 +23,7 @@ intltz_get_offset(null, time()*1000, false, $a, $a); Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d bool(false) -Fatal error: Uncaught TypeError: intltz_get_offset() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_offset(NULL, %d, false, NULL, NULL) #1 {main} diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt index 5b495322a1..612fa9b39d 100644 --- a/ext/intl/tests/timezone_getRawOffset_error.phpt +++ b/ext/intl/tests/timezone_getRawOffset_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); intltz_get_raw_offset(null); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_get_raw_offset() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_get_raw_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_get_raw_offset(NULL) #1 {main} diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt index 4f99dc6eb5..99d2a2e21d 100644 --- a/ext/intl/tests/timezone_hasSameRules_error.phpt +++ b/ext/intl/tests/timezone_hasSameRules_error.phpt @@ -31,7 +31,7 @@ try { } --EXPECT-- int(0) -string(106) "IntlTimeZone::hasSameRules() expects argument #1 ($otherTimeZone) to be of type IntlTimeZone, string given" +string(101) "IntlTimeZone::hasSameRules(): Argument #1 ($otherTimeZone) must be of type IntlTimeZone, string given" int(0) -string(88) "intltz_has_same_rules() expects argument #1 ($tz) to be of type IntlTimeZone, null given" +string(83) "intltz_has_same_rules(): Argument #1 ($tz) must be of type IntlTimeZone, null given" diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt index fc07b16ad5..530c73e3be 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt @@ -21,7 +21,7 @@ var_dump(intltz_to_date_time_zone(1)); Warning: IntlTimeZone::toDateTimeZone(): intltz_to_date_time_zone: DateTimeZone constructor threw exception in %s on line %d string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)" -Fatal error: Uncaught TypeError: intltz_to_date_time_zone() expects argument #1 ($tz) to be of type IntlTimeZone, int given in %s:%d +Fatal error: Uncaught TypeError: intltz_to_date_time_zone(): Argument #1 ($tz) must be of type IntlTimeZone, int given in %s:%d Stack trace: #0 %s(%d): intltz_to_date_time_zone(1) #1 {main} diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt index 283e42ea23..6f702848a9 100644 --- a/ext/intl/tests/timezone_useDaylightTime_error.phpt +++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); intltz_use_daylight_time(null); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: intltz_use_daylight_time() expects argument #1 ($tz) to be of type IntlTimeZone, null given in %s:%d +Fatal error: Uncaught TypeError: intltz_use_daylight_time(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d Stack trace: #0 %s(%d): intltz_use_daylight_time(NULL) #1 {main} diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt index 3b069cb230..a93554043d 100644 --- a/ext/intl/tests/transliterator_create_inverse_error.phpt +++ b/ext/intl/tests/transliterator_create_inverse_error.phpt @@ -10,7 +10,7 @@ ini_set("intl.error_level", E_WARNING); transliterator_create_inverse("jj"); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: transliterator_create_inverse() expects argument #1 ($orig_trans) to be of type Transliterator, string given in %s:%d +Fatal error: Uncaught TypeError: transliterator_create_inverse(): Argument #1 ($orig_trans) must be of type Transliterator, string given in %s:%d Stack trace: #0 %s(%d): transliterator_create_inverse('jj') #1 {main} diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt index bfd3c1b118..64f9ea5cc2 100644 --- a/ext/intl/tests/transliterator_get_error_code_error.phpt +++ b/ext/intl/tests/transliterator_get_error_code_error.phpt @@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING); echo transliterator_get_error_code(array()), "\n"; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: transliterator_get_error_code() expects argument #1 ($trans) to be of type Transliterator, array given in %s:%d +Fatal error: Uncaught TypeError: transliterator_get_error_code(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d Stack trace: #0 %s(%d): transliterator_get_error_code(Array) #1 {main} diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt index 543480d55e..9c2e837da3 100644 --- a/ext/intl/tests/transliterator_get_error_message_error.phpt +++ b/ext/intl/tests/transliterator_get_error_message_error.phpt @@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING); echo transliterator_get_error_message(array()), "\n"; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: transliterator_get_error_message() expects argument #1 ($trans) to be of type Transliterator, array given in %s:%d +Fatal error: Uncaught TypeError: transliterator_get_error_message(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d Stack trace: #0 %s(%d): transliterator_get_error_message(Array) #1 {main} diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt index ad05ca1b9f..93c3c497a2 100644 --- a/ext/libxml/tests/004.phpt +++ b/ext/libxml/tests/004.phpt @@ -28,15 +28,15 @@ echo "Done\n"; ?> --EXPECT-- -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, null given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, null given bool(true) -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, string given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, string given bool(true) -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, int given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, int given bool(true) -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, object given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, object given bool(true) -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, array given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, array given bool(true) NULL bool(true) diff --git a/ext/libxml/tests/bug63389.phpt b/ext/libxml/tests/bug63389.phpt index 12b3a032a5..88fce5d115 100644 --- a/ext/libxml/tests/bug63389.phpt +++ b/ext/libxml/tests/bug63389.phpt @@ -14,5 +14,5 @@ try { echo "okey"; ?> --EXPECT-- -libxml_set_streams_context() expects argument #1 ($context) to be of type resource, string given +libxml_set_streams_context(): Argument #1 ($context) must be of type resource, string given okey diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt index 3f6c1132d1..27e321bb64 100644 --- a/ext/mbstring/tests/mb_ereg1.phpt +++ b/ext/mbstring/tests/mb_ereg1.phpt @@ -45,7 +45,7 @@ array(3) { array(0) { } } -mb_ereg() expects argument #1 ($pattern) to be of type string, array given +mb_ereg(): Argument #1 ($pattern) must be of type string, array given array(3) { [0]=> array(0) { @@ -55,7 +55,7 @@ array(3) { [2]=> &string(0) "" } -mb_ereg() expects argument #2 ($string) to be of type string, array given +mb_ereg(): Argument #2 ($string) must be of type string, array given array(3) { [0]=> int(1) diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index 0cd2696c5a..f11984d0ef 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -96,7 +96,7 @@ if (!$TEST_EXPERIMENTAL) --EXPECTF-- Warning: Wrong parameter count for mysqli_warning::mysqli_warning() in %s on line %d -Warning: mysqli_warning::mysqli_warning() expects argument #1 to be of type object, null given in %s on line %d +Warning: mysqli_warning::mysqli_warning(): Argument #1 must be of type object, null given in %s on line %d Warning: Wrong parameter count for mysqli_warning::mysqli_warning() in %s on line %d diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt index ecd096953f..aa970aaf74 100644 --- a/ext/mysqli/tests/mysqli_embedded_connect.phpt +++ b/ext/mysqli/tests/mysqli_embedded_connect.phpt @@ -28,5 +28,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Warning: mysqli_embedded_connect() expects argument #1 to be of type mysqli, null given in %s on line %d +Warning: mysqli_embedded_connect(): Argument #1 must be of type mysqli, null given in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index f1bbab7e39..c3dde0e2f7 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -145,6 +145,6 @@ Exception: Too few arguments to function mysqli_fetch_object_construct::__constr NULL NULL mysqli_result object is already closed -[0] mysqli_fetch_object() expects argument #3 ($params) to be of type array, string given in %s on line %d +[0] mysqli_fetch_object(): Argument #3 ($params) must be of type array, string given in %s on line %d Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 82e1814050..341a08ef79 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -130,9 +130,9 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- mysqli object is not fully initialized -[0] mysqli_result::fetch_object() expects argument #1 ($class_name) to 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, object 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() expects argument #2 ($params) to be of type array, null 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 NULL NULL diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt index 4875b1dc17..fcb41dd7c9 100644 --- a/ext/oci8/tests/bug51291_1.phpt +++ b/ext/oci8/tests/bug51291_1.phpt @@ -165,7 +165,7 @@ array(4) { Test 2 - Parse -Warning: oci_error() expects argument #1 to be of type resource, bool%sgiven in %sbug51291_1.php on line %d +Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> @@ -180,7 +180,7 @@ array(4) { NULL 2nd call -Warning: oci_error() expects argument #1 to be of type resource, bool%sgiven in %sbug51291_1.php on line %d +Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index 14bdfb73d6..72ed493d8a 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -79,17 +79,17 @@ echo "Done\n"; Invalid Connection resource -Warning: oci_set_action() expects argument #1 to be of type resource, null given in %s on line %d +Warning: oci_set_action(): Argument #1 must be of type resource, null given in %s on line %d NULL Invalid Connection resource 2 -Warning: oci_set_client_info() expects argument #1 to be of type resource, %s given in %s on line %d +Warning: oci_set_client_info(): Argument #1 must be of type resource, %s given in %s on line %d NULL Invalid Value -Warning: oci_set_action() expects argument #2 to be of type %s, resource given in %s on line %d +Warning: oci_set_action(): Argument #2 must be of type %s, resource given in %s on line %d NULL Set Values multiple times diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index e69de8e0db..426ab91cba 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -60,13 +60,13 @@ object(OCI-Lob)#%d (1) { } int(0) -Warning: OCI-Lob::write() expects argument #2 to be of type int%s string given in %slob_002.php on line %d +Warning: OCI-Lob::write(): Argument #2 must be of type int%s string given in %slob_002.php on line %d NULL int(4) int(40000) int(40004) -Warning: OCI-Lob::seek() expects argument #1 to be of type int%s string given in %slob_002.php on line %d +Warning: OCI-Lob::seek(): Argument #1 must be of type int%s string given in %slob_002.php on line %d NULL bool(false) int(40004) diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt index 0745c76c3c..3fbf4fab5a 100644 --- a/ext/oci8/tests/lob_021.phpt +++ b/ext/oci8/tests/lob_021.phpt @@ -61,7 +61,7 @@ bool(false) Warning: oci_free_descriptor(): %s is not a valid oci8 descriptor resource in %s on line %d bool(false) -Warning: oci_free_descriptor() expects argument #1 to be of type OCI-Lob, object given in %s on line %d +Warning: oci_free_descriptor(): Argument #1 must be of type OCI-Lob, object given in %s on line %d NULL Warning: oci_free_descriptor(): Unable to find descriptor property in %s on line %d diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt index 2a39db46d6..301a8f4b62 100644 --- a/ext/oci8/tests/lob_026.phpt +++ b/ext/oci8/tests/lob_026.phpt @@ -73,7 +73,7 @@ NULL bool(true) int(3) -Warning: oci_lob_seek() expects argument #1 to be of type OCI-Lob, int%sgiven in %s on line %d +Warning: oci_lob_seek(): Argument #1 must be of type OCI-Lob, int%sgiven in %s on line %d NULL bool(true) array(2) { diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt index e5857450f8..4a69258ea3 100644 --- a/ext/oci8/tests/null_byte_1.phpt +++ b/ext/oci8/tests/null_byte_1.phpt @@ -35,9 +35,9 @@ var_dump($r); --EXPECTF-- Test 1: Import -Warning: OCI-Lob::savefile() expects argument #1 ($function) to be a valid path, string given in %snull_byte_1.php on line %d +Warning: OCI-Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d NULL Test 2: Export -Warning: OCI-Lob::export() expects argument #1 ($function) to be a valid path, string given in %snull_byte_1.php on line %d +Warning: OCI-Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d NULL diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index ca785aa361..26955d4b17 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects argument #5 to be of type int%s string given in %s on line %d +Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d Done diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index aaa819ca92..8093620168 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects argument #5 to be of type int%s string given in %s on line %d +Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d Done diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt index 195520484f..b288bcd2d0 100644 --- a/ext/odbc/tests/odbc_exec_001.phpt +++ b/ext/odbc/tests/odbc_exec_001.phpt @@ -28,11 +28,11 @@ odbc_exec($conn, NULL); ?> --EXPECTF-- -Warning: odbc_exec() expects argument #3 to be of type int, string given in %s on line %d +Warning: odbc_exec(): Argument #3 must be of type int, string given in %s on line %d Warning: odbc_exec(): SQL error: %s in %s on line %d -Warning: odbc_exec() expects argument #3 to be of type int, string given in %s on line %d +Warning: odbc_exec(): Argument #3 must be of type int, string given in %s on line %d Warning: odbc_exec(): SQL error: %s in %s on line %d diff --git a/ext/openssl/tests/openssl_csr_export_bacis.phpt b/ext/openssl/tests/openssl_csr_export_bacis.phpt index 714b9f7092..f0a258dd15 100644 --- a/ext/openssl/tests/openssl_csr_export_bacis.phpt +++ b/ext/openssl/tests/openssl_csr_export_bacis.phpt @@ -41,6 +41,6 @@ var_dump(openssl_csr_export($csr, $output, false)); ?> --EXPECT-- bool(true) -openssl_csr_export() expects argument #1 ($csr) to be of type resource, string given +openssl_csr_export(): Argument #1 ($csr) must be of type resource, string given openssl_csr_export(): supplied resource is not a valid OpenSSL X.509 CSR resource bool(true) diff --git a/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt b/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt index 907b7fd844..7f6347840d 100644 --- a/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt @@ -76,6 +76,6 @@ sfBgVeqg0P4SWez5fHXqBNcjMdMI5f0bikcDZSIfTHS8FX+PMurLBC8UPB0YNIOl JViHkCA9x6m8RJXAFvqmgLlWlUzbDv/cRrDfjWjR -----END CERTIFICATE REQUEST----- " -openssl_csr_export_to_file() expects argument #1 ($csr) to be of type resource, string given +openssl_csr_export_to_file(): Argument #1 ($csr) must be of type resource, string given openssl_csr_export_to_file(): supplied resource is not a valid OpenSSL X.509 CSR resource bool(true) diff --git a/ext/openssl/tests/openssl_pkey_new_error.phpt b/ext/openssl/tests/openssl_pkey_new_error.phpt index 1a6235db70..4bed65278c 100644 --- a/ext/openssl/tests/openssl_pkey_new_error.phpt +++ b/ext/openssl/tests/openssl_pkey_new_error.phpt @@ -28,6 +28,6 @@ try { } ?> --EXPECT-- -openssl_pkey_get_details() expects argument #1 ($key) to be of type resource, bool given -openssl_pkey_get_details() expects argument #1 ($key) to be of type resource, bool given -openssl_pkey_get_details() expects argument #1 ($key) to be of type resource, bool given +openssl_pkey_get_details(): Argument #1 ($key) must be of type resource, bool given +openssl_pkey_get_details(): Argument #1 ($key) must be of type resource, bool given +openssl_pkey_get_details(): Argument #1 ($key) must be of type resource, bool given diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt index 5b191a72dc..b3450beff7 100644 --- a/ext/pcre/tests/preg_grep_error1.phpt +++ b/ext/pcre/tests/preg_grep_error1.phpt @@ -57,7 +57,7 @@ Warning: preg_grep(): Unknown modifier 'F' in %spreg_grep_error1.php on line %d bool(false) Arg value is Array -preg_grep() expects argument #1 ($regex) to be of type string, array given +preg_grep(): Argument #1 ($regex) must be of type string, array given Arg value is /[a-zA-Z]/ array(2) { @@ -66,5 +66,5 @@ array(2) { [2]=> string(4) "test" } -preg_grep() expects argument #1 ($regex) to be of type string, object given +preg_grep(): Argument #1 ($regex) must be of type string, object given Done diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt index 3a65fca852..e052327cea 100644 --- a/ext/pcre/tests/preg_match_all_error1.phpt +++ b/ext/pcre/tests/preg_match_all_error1.phpt @@ -62,7 +62,7 @@ bool(false) NULL Arg value is Array -preg_match_all() expects argument #1 ($pattern) to be of type string, array given +preg_match_all(): Argument #1 ($pattern) must be of type string, array given NULL Arg value is /[a-zA-Z]/ @@ -80,5 +80,5 @@ array(1) { string(1) "t" } } -preg_match_all() expects argument #1 ($pattern) to be of type string, object given +preg_match_all(): Argument #1 ($pattern) must be of type string, object given NULL diff --git a/ext/pcre/tests/preg_match_all_error2.phpt b/ext/pcre/tests/preg_match_all_error2.phpt index 98e70385c0..a2254555bb 100644 --- a/ext/pcre/tests/preg_match_all_error2.phpt +++ b/ext/pcre/tests/preg_match_all_error2.phpt @@ -27,7 +27,7 @@ echo "Done"; *** Testing preg_match_all() : error conditions *** Arg value is: Array -preg_match_all() expects argument #2 ($subject) to be of type string, array given +preg_match_all(): Argument #2 ($subject) must be of type string, array given NULL Arg value is: test diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt index 3dbb7c2f03..b4540bf5da 100644 --- a/ext/pcre/tests/preg_match_error1.phpt +++ b/ext/pcre/tests/preg_match_error1.phpt @@ -56,8 +56,8 @@ Warning: preg_match(): Unknown modifier 'F' in %spreg_match_error1.php on line % bool(false) Arg value is Array -preg_match() expects argument #1 ($pattern) to be of type string, array given +preg_match(): Argument #1 ($pattern) must be of type string, array given Arg value is /[a-zA-Z]/ int(1) -preg_match() expects argument #1 ($pattern) to be of type string, object given +preg_match(): Argument #1 ($pattern) must be of type string, object given diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt index bc48facc0a..a03bcf4417 100644 --- a/ext/pcre/tests/preg_match_error2.phpt +++ b/ext/pcre/tests/preg_match_error2.phpt @@ -35,6 +35,6 @@ Arg value is: this is a string int(1) Arg value is: Array -preg_match() expects argument #2 ($subject) to be of type string, array given -preg_match() expects argument #2 ($subject) to be of type string, object given +preg_match(): Argument #2 ($subject) must be of type string, array given +preg_match(): Argument #2 ($subject) must be of type string, object given Done diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt index 0ec80d99f1..daf7852767 100644 --- a/ext/pcre/tests/preg_split_error1.phpt +++ b/ext/pcre/tests/preg_split_error1.phpt @@ -56,7 +56,7 @@ Warning: preg_split(): Unknown modifier 'F' in %spreg_split_error1.php on line % bool(false) Arg value is Array -preg_split() expects argument #1 ($pattern) to be of type string, array given +preg_split(): Argument #1 ($pattern) must be of type string, array given Arg value is /[a-zA-Z]/ array(3) { @@ -67,4 +67,4 @@ array(3) { [2]=> string(4) " 5 6" } -preg_split() expects argument #1 ($pattern) to be of type string, object given +preg_split(): Argument #1 ($pattern) must be of type string, object given diff --git a/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt b/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt index b2ee84a945..1b566be3e3 100644 --- a/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt @@ -47,7 +47,7 @@ SQL if (false !== ($tmp = @$stmt->getColumnMeta(-1))) printf("[004] Expecting false got %s\n", var_export($tmp, true)); - // Warning: PDOStatement::getColumnMeta() expects argument #1 to be of type int, array given in + // Warning: PDOStatement::getColumnMeta(): Argument #1 must be of type int, array given in if (false !== ($tmp = @$stmt->getColumnMeta(array()))) printf("[005] Expecting false got %s\n", var_export($tmp, true)); diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index e086e89c28..f2aee20828 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -228,40 +228,40 @@ try { } ?> --EXPECTF-- -Phar::mungServer() expects argument #1 ($munglist) to be of type array, string given -Phar::createDefaultStub() expects argument #1 ($index) to be a valid path, array given -Phar::loadPhar() expects argument #1 ($filename) to be a valid path, array given -Phar::canCompress() expects argument #1 ($method) to be of type int, string given -Phar::__construct() expects argument #1 ($filename) to be a valid path, array given -Phar::convertToExecutable() expects argument #1 ($format) to be of type int, array given -Phar::convertToData() expects argument #1 ($format) to be of type int, array given -PharData::delete() expects argument #1 ($entry) to be a valid path, array given +Phar::mungServer(): Argument #1 ($munglist) must be of type array, string given +Phar::createDefaultStub(): Argument #1 ($index) must be a valid path, array given +Phar::loadPhar(): Argument #1 ($filename) must be a valid path, array given +Phar::canCompress(): Argument #1 ($method) must be of type int, string given +Phar::__construct(): Argument #1 ($filename) must be a valid path, array given +Phar::convertToExecutable(): Argument #1 ($format) must be of type int, array given +Phar::convertToData(): Argument #1 ($format) must be of type int, array given +PharData::delete(): Argument #1 ($entry) must be a valid path, array given Cannot write out phar archive, phar is read-only Entry oops does not exist and cannot be deleted %sfrontcontroller10.phar Cannot write out phar archive, phar is read-only A Phar alias cannot be set in a plain tar archive -Phar::setAlias() expects argument #1 ($alias) to be of type string, array given +Phar::setAlias(): Argument #1 ($alias) must be of type string, array given Cannot change stub, phar is read-only A Phar stub cannot be set in a plain tar archive -Phar::setStub() expects argument #1 ($newstub) to be of type string, array given +Phar::setStub(): Argument #1 ($newstub) must be of type string, array given A Phar stub cannot be set in a plain tar archive -Phar::setDefaultStub() expects argument #1 ($index) to be of type string, array given +Phar::setDefaultStub(): Argument #1 ($index) must be of type string, array given Cannot change stub: phar.readonly=1 Cannot set signature algorithm, phar is read-only -Phar::compress() expects argument #1 ($compression_type) to be of type int, array given +Phar::compress(): Argument #1 ($compression_type) must be of type int, array given Cannot compress phar archive, phar is read-only -Phar::compressFiles() expects argument #1 ($compression_type) to be of type int, array given +Phar::compressFiles(): Argument #1 ($compression_type) must be of type int, array given Phar is readonly, cannot change compression Phar::copy() expects exactly 2 parameters, 1 given Cannot copy "a" to "b", phar is read-only -Phar::offsetExists() expects argument #1 ($entry) to be a valid path, array given -Phar::offsetGet() expects argument #1 ($entry) to be a valid path, array given +Phar::offsetExists(): Argument #1 ($entry) must be a valid path, array given +Phar::offsetGet(): Argument #1 ($entry) must be a valid path, array given Phar::offsetSet() expects exactly 2 parameters, 1 given -PharData::offsetUnset() expects argument #1 ($entry) to be a valid path, array given +PharData::offsetUnset(): Argument #1 ($entry) must be a valid path, array given Write operations disabled by the php.ini setting phar.readonly -Phar::addEmptyDir() expects argument #1 ($dirname) to be a valid path, array given -Phar::addFile() expects argument #1 ($filename) to be a valid path, array given +Phar::addEmptyDir(): Argument #1 ($dirname) must be a valid path, array given +Phar::addFile(): Argument #1 ($filename) must be a valid path, array given Phar::addFromString() expects exactly 2 parameters, 1 given Write operations disabled by the php.ini setting phar.readonly Phar::setMetadata() expects exactly 1 parameter, 2 given diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt index 8c25692c3f..2b4b17051e 100644 --- a/ext/phar/tests/bug64931/bug64931.phpt +++ b/ext/phar/tests/bug64931/bug64931.phpt @@ -53,4 +53,4 @@ CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory -CAUGHT: Phar::addFromString() expects argument #1 ($localname) to be a valid path, string given +CAUGHT: Phar::addFromString(): Argument #1 ($localname) must be a valid path, string given diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 458ec8b6f5..ce0b8a59a2 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -78,4 +78,4 @@ string(5) "query" 11:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character 12:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character 13:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character -Exception: Phar::offsetSet() expects argument #1 ($entry) to be a valid path, string given +Exception: Phar::offsetSet(): Argument #1 ($entry) must be a valid path, string given diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 861933ba4e..8f4b40c72b 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -49,7 +49,7 @@ include $pname . '/foo/hi'; <?php rmdir(__DIR__ . '/poo'); ?> <?php unlink(__DIR__ . '/fgc_edgecases.txt'); ?> --EXPECTF-- -file_get_contents() expects argument #1 ($filename) to be a valid path, array given +file_get_contents(): Argument #1 ($filename) must be a valid path, array given blah <?php echo file_get_contents("foo/" . basename(__FILE__)); diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 548f50a362..9d9b9feed9 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -38,7 +38,7 @@ include $pname . '/foo/hi'; <?php rmdir(__DIR__ . '/poo'); ?> <?php unlink(__DIR__ . '/fopen_edgecases2.txt'); ?> --EXPECTF-- -fopen() expects argument #1 ($filename) to be a valid path, array given +fopen(): Argument #1 ($filename) must be a valid path, array given blah test diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index 59deca53c8..14f7f5dae0 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -55,7 +55,7 @@ include $pname . '/foo'; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(__DIR__ . '/poo'); --EXPECTF-- -opendir() expects argument #1 ($path) to be a valid path, array given +opendir(): Argument #1 ($path) must be a valid path, array given . .. foo diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt index e5bba5d757..bbe95dec0d 100644 --- a/ext/phar/tests/phar_extract.phpt +++ b/ext/phar/tests/phar_extract.phpt @@ -142,7 +142,7 @@ string(3) "hi3" string(3) "hi2" bool(false) Invalid argument, expected a filename (string) or array of filenames -Phar::extractTo() expects argument #1 ($pathto) to be a valid path, array given +Phar::extractTo(): Argument #1 ($pathto) must be a valid path, array given Invalid argument, extraction path must be non-zero length Unable to use path "%soops" for extraction, it is a file, must be a directory Invalid argument, array of filenames to extract contains non-string value diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt index 5de390600f..c050859b86 100644 --- a/ext/phar/tests/phar_oo_006.phpt +++ b/ext/phar/tests/phar_oo_006.phpt @@ -40,7 +40,7 @@ unlink(__DIR__ . '/files/phar_oo_006.phar.php'); __halt_compiler(); ?> --EXPECTF-- -SplFileInfo::setFileClass() expects argument #1 ($class_name) to be a class name derived from SplFileObject, 'SplFileInfo' given +SplFileInfo::setFileClass(): Argument #1 ($class_name) must be a class name derived from SplFileObject, 'SplFileInfo' given MyFile::__construct(phar://%s/a.php) a.php MyFile::__construct(phar://%s/b/c.php) diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt index 70b251257d..5dc55ce487 100644 --- a/ext/phar/tests/phar_unlinkarchive.phpt +++ b/ext/phar/tests/phar_unlinkarchive.phpt @@ -92,7 +92,7 @@ __HALT_COMPILER(); Unknown phar archive "" Unknown phar archive "%sphar_unlinkarchive.phar" Unknown phar archive "%sphar_unlinkarchive.phar.tar": internal corruption of phar "%sphar_unlinkarchive.phar.tar" (truncated entry) -Phar::unlinkArchive() expects argument #1 ($archive) to be a valid path, array given +Phar::unlinkArchive(): Argument #1 ($archive) must be a valid path, array given bool(false) string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>" phar archive "%sphar_unlinkarchive.phar" has open file handles or objects. fclose() all file handles, and unset() all objects prior to calling unlinkArchive() diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt index 5ac63d82f5..5f22264423 100644 --- a/ext/phar/tests/pharfileinfo_construct.phpt +++ b/ext/phar/tests/pharfileinfo_construct.phpt @@ -49,7 +49,7 @@ echo $e->getMessage() . "\n"; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- Cannot open phar file 'phar://%spharfileinfo_construct.phar/oops': internal corruption of phar "%spharfileinfo_construct.phar" (truncated entry) -PharFileInfo::__construct() expects argument #1 ($filename) to be a valid path, array given +PharFileInfo::__construct(): Argument #1 ($filename) must be a valid path, array given Cannot access phar file entry '%s' in archive '%s' Cannot call constructor twice '%s' is not a valid phar archive URL (must have at least phar://filename.phar) diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt index 721ad337cc..e48d43587e 100644 --- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt @@ -62,5 +62,5 @@ Method does not exist Method 1 does not exist Method 1.5 does not exist Method 1 does not exist -ReflectionClass::getMethod() expects argument #1 ($name) to be of type string, array given -ReflectionClass::getMethod() expects argument #1 ($name) to be of type string, object given +ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, array given +ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, object given diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt index dd3b5f33a2..86060c8acf 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt @@ -60,5 +60,5 @@ Property does not exist Property 1 does not exist Property 1.5 does not exist Property 1 does not exist -ReflectionClass::getProperty() expects argument #1 ($name) to be of type string, array given -ReflectionClass::getProperty() expects argument #1 ($name) to be of type string, object given +ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, array given +ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, object given diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt index 2cdbcebefb..e034e08215 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt @@ -43,4 +43,4 @@ ReflectionClass::getStaticPropertyValue() expects at most 2 parameters, 3 given ReflectionClass::getStaticPropertyValue() expects at least 1 parameter, 0 given Class C does not have a property named string(3) "def" -ReflectionClass::getStaticPropertyValue() expects argument #1 ($name) to be of type string, array given +ReflectionClass::getStaticPropertyValue(): Argument #1 ($name) must be of type string, array given diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt index 1805607e19..e7256ea2cb 100644 --- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt @@ -16,7 +16,7 @@ var_dump($a); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: ReflectionClass::newInstanceArgs() expects argument #1 ($args) to be of type array, string given in %s:%d +Fatal error: Uncaught TypeError: ReflectionClass::newInstanceArgs(): Argument #1 ($args) must be of type array, string given in %s:%d Stack trace: #0 %s(%d): ReflectionClass->newInstanceArgs('x') #1 {main} diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt index 87cb894ea8..b9bb76c786 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt @@ -49,4 +49,4 @@ ReflectionClass::setStaticPropertyValue() expects exactly 2 parameters, 0 given ReflectionClass::setStaticPropertyValue() expects exactly 2 parameters, 1 given Class C does not have a property named Class C does not have a property named 1.5 -ReflectionClass::setStaticPropertyValue() expects argument #1 ($name) to be of type string, array given +ReflectionClass::setStaticPropertyValue(): Argument #1 ($name) must be of type string, array given diff --git a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt index 1047c927dc..ccf2414e43 100644 --- a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt +++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt @@ -28,4 +28,4 @@ try { --EXPECTF-- Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given -Ok - ReflectionExtension::__construct() expects argument #1 ($name) to be of type string, array given +Ok - ReflectionExtension::__construct(): Argument #1 ($name) must be of type string, array given diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt index dbd829252b..1772ba5b68 100644 --- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt +++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt @@ -35,8 +35,8 @@ try { ?> --EXPECT-- -Ok - ReflectionFunction::__construct() expects argument #1 ($name) to be of type string, array given +Ok - ReflectionFunction::__construct(): Argument #1 ($name) must be of type string, array given Function nonExistentFunction() does not exist Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 0 given Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 2 given -Ok - ReflectionFunction::__construct() expects argument #1 ($name) to be of type string, array given +Ok - ReflectionFunction::__construct(): Argument #1 ($name) must be of type string, array given diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt index 0d585d2a73..869682ccdd 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt @@ -24,4 +24,4 @@ try { ?> --EXPECT-- -string(90) "ReflectionMethod::invokeArgs() expects argument #2 ($args) to be of type array, bool given" +string(85) "ReflectionMethod::invokeArgs(): Argument #2 ($args) must be of type array, bool given" diff --git a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt index 3dc0ed626e..5ff9d2e50d 100644 --- a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt @@ -103,7 +103,7 @@ NULL Static method: ReflectionMethod::invoke() expects at least 1 parameter, 0 given -ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, bool given +ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, bool given Called staticMethod() Exception: Using $this when not in object context NULL diff --git a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt index 8788370b2f..2b50fa8131 100644 --- a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt +++ b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt @@ -59,7 +59,7 @@ try { ?> --EXPECT-- invoke() on a non-object: -string(89) "ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, bool given" +string(84) "ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, bool given" invoke() on a non-instance: string(72) "Given object is not an instance of the class this method was declared in" diff --git a/ext/reflection/tests/ReflectionReference_errors.phpt b/ext/reflection/tests/ReflectionReference_errors.phpt index e70348cba1..33154ba22e 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() expects argument #1 ($array) to be of type array, object given +ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, object given Key must be array or string Array key not found Serialization of 'ReflectionReference' is not allowed diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt index 014d0d0321..5e5c3c5be5 100644 --- a/ext/reflection/tests/bug42976.phpt +++ b/ext/reflection/tests/bug42976.phpt @@ -26,9 +26,9 @@ echo "Done\n"; --EXPECTF-- string(9) "x.changed" -Warning: C::__construct() expects argument #1 ($x) to be passed by reference, value given in %s on line %d +Warning: C::__construct(): Argument #1 ($x) must be passed by reference, value given in %s on line %d string(10) "x.original" -Warning: C::__construct() expects argument #1 ($x) to be passed by reference, value given in %s on line %d +Warning: C::__construct(): Argument #1 ($x) must be passed by reference, value given in %s on line %d string(10) "x.original" Done diff --git a/ext/reflection/tests/request38992.phpt b/ext/reflection/tests/request38992.phpt index 0266cee430..b7cd212551 100644 --- a/ext/reflection/tests/request38992.phpt +++ b/ext/reflection/tests/request38992.phpt @@ -23,5 +23,5 @@ try { } ?> --EXPECT-- -ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, string given -ReflectionMethod::invokeArgs() expects argument #1 ($object) to be of type object, string given +ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, string given +ReflectionMethod::invokeArgs(): Argument #1 ($object) must be of type object, string given 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 269005565d..6c11849956 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() expects argument #1 ($open) to be of type SessionHandlerInterface, object given +session_set_save_handler(): Argument #1 ($open) must be of type SessionHandlerInterface, object given good handler writing diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt index c7adf8f25c..20901ce702 100644 --- a/ext/snmp/tests/snmp-object-error.phpt +++ b/ext/snmp/tests/snmp-object-error.phpt @@ -70,8 +70,8 @@ var_dump($session->max_oids); ?> --EXPECTF-- SNMP::__construct() expects at least 3 parameters, 2 given -SNMP::__construct() expects argument #4 to be of type int, string given -SNMP::__construct() expects argument #5 to be of type int, string given +SNMP::__construct(): Argument #4 must be of type int, string given +SNMP::__construct(): Argument #5 must be of type int, string given Unknown SNMP protocol version Exception handling diff --git a/ext/soap/tests/bug77088.phpt b/ext/soap/tests/bug77088.phpt index ed2bea1465..46d2e1d987 100644 --- a/ext/soap/tests/bug77088.phpt +++ b/ext/soap/tests/bug77088.phpt @@ -21,7 +21,7 @@ catch(TypeError $e) --EXPECTF-- object(TypeError)#%d (%d) { ["message":protected]=> - string(%d) "SoapClient::__construct() expects argument #2 ($options) to be of type array, null given" + string(%d) "SoapClient::__construct(): Argument #2 ($options) must be of type array, null given" ["string":"Error":private]=> string(0) "" ["code":protected]=> diff --git a/ext/sodium/tests/sodium_error_001.phpt b/ext/sodium/tests/sodium_error_001.phpt index b5b19b1d12..5ebcb8e80e 100644 --- a/ext/sodium/tests/sodium_error_001.phpt +++ b/ext/sodium/tests/sodium_error_001.phpt @@ -15,7 +15,7 @@ $key = random_bytes(SODIUM_CRYPTO_SHORTHASH_KEYBYTES); $hash = do_crypto_shorthash($m, $key); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: sodium_crypto_shorthash() expects argument #1 ($string) to be of type string, int given in %s:%d +Fatal error: Uncaught TypeError: sodium_crypto_shorthash(): Argument #1 ($string) must be of type string, int given in %s:%d Stack trace: #0 %s(%d): sodium_crypto_shorthash() #1 %s(%d): do_crypto_shorthash() diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt index e1d37ecce5..11529cfee0 100644 --- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt +++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt @@ -43,6 +43,6 @@ try { --EXPECT-- CallbackFilterIterator::__construct() expects exactly 2 parameters, 0 given CallbackFilterIterator::__construct() expects exactly 2 parameters, 1 given -CallbackFilterIterator::__construct() expects argument #2 ($callback) to be a valid callback, no array or string given -CallbackFilterIterator::__construct() expects argument #2 ($callback) to be a valid callback, array must have exactly two members +CallbackFilterIterator::__construct(): Argument #2 ($callback) must be a valid callback, no array or string given +CallbackFilterIterator::__construct(): Argument #2 ($callback) must be a valid callback, array must have exactly two members some message diff --git a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt index b8aea64ea2..c1b373cebe 100644 --- a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt +++ b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -SplFileInfo::setFileClass() expects argument #1 ($class_name) to be a class name derived from SplFileObject, 'stdClass' given +SplFileInfo::setFileClass(): Argument #1 ($class_name) must be a class name derived from SplFileObject, 'stdClass' given diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt index b0a358a9b3..f9ef81aeeb 100644 --- a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt +++ b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -SplFileInfo::setInfoClass() expects argument #1 ($class_name) to be a class name derived from SplFileInfo, 'stdClass' given +SplFileInfo::setInfoClass(): Argument #1 ($class_name) must be a class name derived from SplFileInfo, 'stdClass' given diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt index f4fb329989..76f32855b2 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, array given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, array given diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt index 240631cc88..1c9a681e82 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to 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/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt index cfb0ca79a9..12e632514e 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() expects argument #1 ($size) to be of type int, object given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object given diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt index aaf2738915..855479c54a 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt @@ -9,4 +9,4 @@ try { } ?> --EXPECT-- -SplTempFileObject::__construct() expects argument #1 ($max_memory) to be of type int, string given +SplTempFileObject::__construct(): Argument #1 ($max_memory) must be of type int, string given diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt index b7700e4e31..3ac214260a 100644 --- a/ext/spl/tests/arrayObject___construct_error1.phpt +++ b/ext/spl/tests/arrayObject___construct_error1.phpt @@ -20,6 +20,6 @@ try { ?> --EXPECT-- Bad iterator type: -ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'Exception' given(6) +ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'Exception' given(6) Non-existent class: -ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'nonExistentClassName' given(13) +ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'nonExistentClassName' given(13) diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt index db751c6fba..042e317273 100644 --- a/ext/spl/tests/arrayObject_asort_basic1.phpt +++ b/ext/spl/tests/arrayObject_asort_basic1.phpt @@ -38,7 +38,7 @@ object(ArrayObject)#%d (1) { int(4) } } -asort() expects argument #2 ($sort_flags) to be of type int, string given +asort(): Argument #2 ($sort_flags) must be of type int, string given object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> array(3) { diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt index 6e20013177..892e392b8b 100644 --- a/ext/spl/tests/arrayObject_ksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt @@ -37,7 +37,7 @@ object(ArrayObject)#%d (1) { int(3) } } -ksort() expects argument #2 ($sort_flags) to be of type int, string given +ksort(): Argument #2 ($sort_flags) must be of type int, string given object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> array(4) { diff --git a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt index a80c8cbb0d..918dcbee96 100644 --- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt +++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt @@ -43,7 +43,7 @@ try { ?> --EXPECT-- -string(135) "ArrayObject::setIteratorClass() expects argument #1 ($iteratorClass) to be a class name derived from Iterator, 'nonExistentClass' given" -string(127) "ArrayObject::setIteratorClass() expects argument #1 ($iteratorClass) to be a class name derived from Iterator, 'stdClass' given" -string(131) "ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'nonExistentClass' given" -string(123) "ArrayObject::__construct() expects argument #3 ($iterator_class) to be a class name derived from Iterator, 'stdClass' given" +string(130) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, 'nonExistentClass' given" +string(122) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, 'stdClass' given" +string(126) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'nonExistentClass' given" +string(118) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, 'stdClass' given" diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt index e48f80fe00..2521c50223 100644 --- a/ext/spl/tests/bug54291.phpt +++ b/ext/spl/tests/bug54291.phpt @@ -5,7 +5,7 @@ Bug #54291 (Crash iterating DirectoryIterator for dir name starting with \0) $dir = new DirectoryIterator("\x00/abc"); $dir->isFile(); --EXPECTF-- -Fatal error: Uncaught TypeError: DirectoryIterator::__construct() expects argument #1 ($path) to be a valid path, string given in %s:%d +Fatal error: Uncaught TypeError: DirectoryIterator::__construct(): Argument #1 ($path) must be a valid path, string given in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('\x00/abc') #1 {main} diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt index 9355ef4408..27bd706ad8 100644 --- a/ext/spl/tests/bug54292.phpt +++ b/ext/spl/tests/bug54292.phpt @@ -11,4 +11,4 @@ try { ?> --EXPECT-- -string(95) "SplFileObject::__construct() expects argument #2 ($open_mode) to be of type string, array given" +string(90) "SplFileObject::__construct(): Argument #2 ($open_mode) must be of type string, array given" diff --git a/ext/spl/tests/bug77431.phpt b/ext/spl/tests/bug77431.phpt index 20545fb141..75d5c2d600 100644 --- a/ext/spl/tests/bug77431.phpt +++ b/ext/spl/tests/bug77431.phpt @@ -5,5 +5,8 @@ Bug #77431 (SplFileInfo::__construct() accepts NUL bytes) new SplFileInfo("bad\0good"); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: SplFileInfo::__construct() expects argument #1 ($file_name) to be a valid path, string given in %s:%d -Stack trace:%A +Fatal error: Uncaught TypeError: SplFileInfo::__construct(): Argument #1 ($file_name) must be a valid path, string given in %s:%d +Stack trace: +#0 %s(%d): SplFileInfo->__construct('bad\x00good') +#1 {main} + thrown in %s on line %d diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt index 4db36c202e..ad18f49689 100644 --- a/ext/spl/tests/bug78863.phpt +++ b/ext/spl/tests/bug78863.phpt @@ -16,7 +16,7 @@ foreach ($it as $fileinfo) { } ?> --EXPECTF-- -Fatal error: Uncaught TypeError: DirectoryIterator::__construct() expects argument #1 ($path) to be a valid path, string given in %s:%d +Fatal error: Uncaught TypeError: DirectoryIterator::__construct(): Argument #1 ($path) must be a valid path, string given in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('%s') #1 {main} diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt index 80fffd1566..573a995cb1 100644 --- a/ext/spl/tests/fixedarray_005.phpt +++ b/ext/spl/tests/fixedarray_005.phpt @@ -23,6 +23,6 @@ try { ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, object given -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, object 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/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt index 6dc6e4cbca..9cc684ce03 100644 --- a/ext/spl/tests/fixedarray_009.phpt +++ b/ext/spl/tests/fixedarray_009.phpt @@ -10,4 +10,4 @@ try { } ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to 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/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt index 74814268e7..1936cc962b 100644 --- a/ext/spl/tests/fixedarray_015.phpt +++ b/ext/spl/tests/fixedarray_015.phpt @@ -12,5 +12,5 @@ try { echo "Done\n"; ?> --EXPECT-- -Ok - SplFixedArray::__construct() expects argument #1 ($size) to be of type int, string given +Ok - SplFixedArray::__construct(): Argument #1 ($size) must be of type int, string given Done diff --git a/ext/spl/tests/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt index f768e47077..4ede8afa59 100644 --- a/ext/spl/tests/iterator_042.phpt +++ b/ext/spl/tests/iterator_042.phpt @@ -39,7 +39,7 @@ foreach($it as $k => $v) ?> --EXPECTF-- -Error AppendIterator::append() expects argument #1 ($iterator) to be of type Iterator, array given in %s on line %d +Error AppendIterator::append(): Argument #1 ($iterator) must be of type Iterator, array given in %s on line %d object(ArrayIterator)#%d (1) { %s"storage"%s"ArrayIterator":private]=> array(2) { diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt index c62abb5c1a..21ab075cc9 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() expects argument #1 ($index) to be of type string, object given -CachingIterator::offsetGet() expects argument #1 ($index) to be of type string, object given +CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given +CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given ===2=== object(MyFoo)#%d (0) { } @@ -124,8 +124,8 @@ int(0) ===1=== object(stdClass)#1 (0) { } -CachingIterator::offsetExists() expects argument #1 ($index) to be of type string, object given -CachingIterator::offsetGet() expects argument #1 ($index) to be of type string, object given +CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, object given +CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, object given ===2=== object(MyFoo)#2 (0) { } diff --git a/ext/spl/tests/iterator_count.phpt b/ext/spl/tests/iterator_count.phpt index 3071f9b06c..62f9ee8334 100644 --- a/ext/spl/tests/iterator_count.phpt +++ b/ext/spl/tests/iterator_count.phpt @@ -13,7 +13,7 @@ iterator_count('1'); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: iterator_count() expects argument #1 ($iterator) to be of type Traversable, string given in %s:%d +Fatal error: Uncaught TypeError: iterator_count(): Argument #1 ($iterator) must be of type Traversable, string given in %s:%d Stack trace: #0 %s(%d): iterator_count('1') #1 {main} diff --git a/ext/spl/tests/iterator_to_array.phpt b/ext/spl/tests/iterator_to_array.phpt index 09dcf5d02f..a754c9da6f 100644 --- a/ext/spl/tests/iterator_to_array.phpt +++ b/ext/spl/tests/iterator_to_array.phpt @@ -13,7 +13,7 @@ iterator_to_array('test','test'); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: iterator_to_array() expects argument #1 ($iterator) to be of type Traversable, string given in %s:%d +Fatal error: Uncaught TypeError: iterator_to_array(): Argument #1 ($iterator) must be of type Traversable, string given in %s:%d Stack trace: #0 %s(%d): iterator_to_array('test', 'test') #1 {main} diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt index 0f4fed97b3..39a94ba8d3 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() expects argument #1 ($iterator) to be of type RecursiveIterator, object given +RecursiveCachingIterator::__construct(): Argument #1 ($iterator) must be of type RecursiveIterator, object given diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt index 0b628d3ee1..0aca8398e6 100644 --- a/ext/spl/tests/spl_004.phpt +++ b/ext/spl/tests/spl_004.phpt @@ -84,6 +84,6 @@ int(5) int(6) int(4) ===ERRORS=== -iterator_apply() expects argument #3 ($args) to be of type array, int given -iterator_apply() expects argument #2 ($function) to be a valid callback, function 'non_existing_function' not found or invalid function name +iterator_apply(): Argument #3 ($args) must be of type array, int given +iterator_apply(): Argument #2 ($function) must be a valid callback, function 'non_existing_function' not found or invalid function name iterator_apply() expects at most 3 parameters, 4 given diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index c391cef48a..5aad3d990a 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -353,7 +353,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ option = PHP_STREAM_META_GROUP_NAME; value = Z_STRVAL_P(group); } else { - zend_type_error("chgrp() expects argument #2 ($group) to be of type string|int, %s given", zend_zval_type_name(group)); + zend_type_error("chgrp(): Argument #2 ($group) must be of type string|int, %s given", zend_zval_type_name(group)); RETURN_THROWS(); } if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) { @@ -382,7 +382,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ RETURN_FALSE; } } else { - zend_type_error("chgrp() expects argument #2 ($group) to be of type string|int, %s given", zend_zval_type_name(group)); + zend_type_error("chgrp(): Argument #2 ($group) must be of type string|int, %s given", zend_zval_type_name(group)); RETURN_THROWS(); } diff --git a/ext/standard/string.c b/ext/standard/string.c index bd68a6c08b..ec397fe97c 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1276,7 +1276,7 @@ PHP_FUNCTION(implode) if (pieces == NULL) { if (arg1_array == NULL) { - zend_type_error("%s() expects argument #1 ($pieces) to be of type array, string given", get_active_function_name()); + zend_type_error("%s(): Argument #1 ($pieces) must be of type array, string given", get_active_function_name()); RETURN_THROWS(); } @@ -1284,7 +1284,7 @@ PHP_FUNCTION(implode) pieces = arg1_array; } else { if (arg1_str == NULL) { - zend_type_error("%s() expects argument #1 ($glue) to be of type string, array given", get_active_function_name()); + zend_type_error("%s(): Argument #1 ($glue) must be of type string, array given", get_active_function_name()); RETURN_THROWS(); } } diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt index e8b8fe174d..c221a3f341 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -24,7 +24,7 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) echo "end\n"; ?> --EXPECT-- -array_change_key_case() expects argument #2 ($case) to be of type int, string given +array_change_key_case(): Argument #2 ($case) must be of type int, string given array(4) { ["ONE"]=> int(1) diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt index 7cd0c1a1fa..afc72f777a 100644 --- a/ext/standard/tests/array/array_diff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt @@ -51,8 +51,8 @@ try { *** Testing array_diff_uassoc() : error conditions *** -- Testing array_diff_uassoc() function with more than expected no. of arguments -- -array_diff_uassoc() expects argument #4 to be a valid callback, array must have exactly two members -array_diff_uassoc() expects argument #6 to be a valid callback, array must have exactly two members +array_diff_uassoc(): Argument #4 must be a valid callback, array must have exactly two members +array_diff_uassoc(): Argument #6 must be a valid callback, array must have exactly two members -- Testing array_diff_uassoc() function with less than expected no. of arguments -- At least 3 parameters are required, 2 given diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt index a3be16c21c..94ae1bbc0a 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt @@ -30,5 +30,5 @@ try { ?> --EXPECT-- *** Testing array_diff_ukey() : usage variation *** -array_diff_ukey() expects argument #3 to be a valid callback, function 'unknown_function' not found or invalid function name -array_diff_ukey() expects argument #3 to be a valid callback, function 'unknown_function' not found or invalid function name +array_diff_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name +array_diff_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt index cedaf840df..90454e855e 100644 --- a/ext/standard/tests/array/array_filter_variation9.phpt +++ b/ext/standard/tests/array/array_filter_variation9.phpt @@ -69,6 +69,6 @@ array(7) { [6]=> NULL } -array_filter() expects argument #2 ($callback) to be a valid callback, function 'echo' not found or invalid function name -array_filter() expects argument #2 ($callback) to be a valid callback, function 'exit' not found or invalid function name +array_filter(): Argument #2 ($callback) must be a valid callback, function 'echo' not found or invalid function name +array_filter(): Argument #2 ($callback) must be a valid callback, function 'exit' not found or invalid function name Done diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index f277285cb6..a6eccc5bd5 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt @@ -28,7 +28,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -array_intersect_ukey() expects argument #3 to be a valid callback, function 'unknown_function' not found or invalid function name -array_intersect_ukey() expects argument #3 to be a valid callback, function 'unknown_function' not found or invalid function name +array_intersect_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name +array_intersect_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index 0e6c6a5263..0024ae1867 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() expects argument #2 ($array) to be of type array, object given +array_key_exists(): Argument #2 ($array) must be of type array, object given Done diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt index 46fed27691..7976f7048e 100644 --- a/ext/standard/tests/array/array_map_object1.phpt +++ b/ext/standard/tests/array/array_map_object1.phpt @@ -137,15 +137,15 @@ array(2) { -- simple class with private variable and method -- SimpleClassPri::add -array_map() expects argument #1 ($callback) to be a valid callback, cannot access private method SimpleClassPri::add() +array_map(): Argument #1 ($callback) must be a valid callback, cannot access private method SimpleClassPri::add() -- simple class with protected variable and method -- SimpleClassPro::mul -array_map() expects argument #1 ($callback) to be a valid callback, cannot access protected method SimpleClassPro::mul() +array_map(): Argument #1 ($callback) must be a valid callback, cannot access protected method SimpleClassPro::mul() -- class without members -- EmptyClass -array_map() expects argument #1 ($callback) to be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members -- abstract class -- ChildClass::emptyFunction @@ -178,9 +178,9 @@ array(2) { int(4) } StaticClass::cube -array_map() expects argument #1 ($callback) to be a valid callback, cannot access private method StaticClass::cube() +array_map(): Argument #1 ($callback) must be a valid callback, cannot access private method StaticClass::cube() StaticClass::retVal -array_map() expects argument #1 ($callback) to be a valid callback, cannot access protected method StaticClass::retVal() +array_map(): Argument #1 ($callback) must be a valid callback, cannot access protected method StaticClass::retVal() -- class implementing an interface -- InterClass::square array(2) { diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt index de43ff2c93..92dbc02181 100644 --- a/ext/standard/tests/array/array_map_object2.phpt +++ b/ext/standard/tests/array/array_map_object2.phpt @@ -44,7 +44,7 @@ echo "Done"; --EXPECT-- *** Testing array_map() : with non-existent class and method *** -- with non-existent class -- -array_map() expects argument #1 ($callback) to be a valid callback, class 'non-existent' not found +array_map(): Argument #1 ($callback) must be a valid callback, class 'non-existent' not found -- with existent class and non-existent method -- -array_map() expects argument #1 ($callback) to be a valid callback, class 'SimpleClass' does not have a method 'non-existent' +array_map(): Argument #1 ($callback) must be a valid callback, class 'SimpleClass' does not have a method 'non-existent' Done diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt index 98f14789b9..387e95ed0b 100644 --- a/ext/standard/tests/array/array_map_object3.phpt +++ b/ext/standard/tests/array/array_map_object3.phpt @@ -81,7 +81,7 @@ array(3) { int(7) } -- accessing child method from parent class -- -array_map() expects argument #1 ($callback) to be a valid callback, class 'ParentClass' does not have a method 'staticChild' +array_map(): Argument #1 ($callback) must be a valid callback, class 'ParentClass' does not have a method 'staticChild' -- accessing parent method using child class object -- array(3) { [0]=> @@ -92,5 +92,5 @@ array(3) { int(7) } -- accessing child method using parent class object -- -array_map() expects argument #1 ($callback) to be a valid callback, class 'ParentClass' does not have a method 'staticChild' +array_map(): Argument #1 ($callback) must be a valid callback, class 'ParentClass' does not have a method 'staticChild' Done diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt index 4f1dba9c85..e662d4913c 100644 --- a/ext/standard/tests/array/array_map_variation12.phpt +++ b/ext/standard/tests/array/array_map_variation12.phpt @@ -49,5 +49,5 @@ array(3) { -- with built-in function 'pow' and one parameter -- pow() expects exactly 2 parameters, 1 given -- with language construct -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'echo' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'echo' not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt index f0b931eddb..bffb42dbeb 100644 --- a/ext/standard/tests/array/array_map_variation14.phpt +++ b/ext/standard/tests/array/array_map_variation14.phpt @@ -123,7 +123,7 @@ array(2) { int(2) } -- with empty string -- -array_map() expects argument #1 ($callback) to be a valid callback, function '' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name -- with empty array -- -array_map() expects argument #1 ($callback) to be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members Done diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt index f352fabc71..0478fb26c2 100644 --- a/ext/standard/tests/array/array_map_variation15.phpt +++ b/ext/standard/tests/array/array_map_variation15.phpt @@ -28,5 +28,5 @@ echo "Done"; ?> --EXPECT-- *** Testing array_map() : non existent 'callback' function *** -array_map() expects argument #1 ($callback) to be a valid callback, function 'non_existent' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'non_existent' not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt index b9d9b51b14..96bad882b2 100644 --- a/ext/standard/tests/array/array_map_variation16.phpt +++ b/ext/standard/tests/array/array_map_variation16.phpt @@ -43,19 +43,19 @@ echo "Done"; --EXPECT-- *** Testing array_map() : non-permmited built-in functions *** -- Iteration 1 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'echo' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'echo' not found or invalid function name -- Iteration 2 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'array' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'array' not found or invalid function name -- Iteration 3 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'empty' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'empty' not found or invalid function name -- Iteration 4 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'eval' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'eval' not found or invalid function name -- Iteration 5 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'exit' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'exit' not found or invalid function name -- Iteration 6 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'isset' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'isset' not found or invalid function name -- Iteration 7 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'list' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'list' not found or invalid function name -- Iteration 8 -- -array_map() expects argument #1 ($callback) to be a valid callback, function 'print' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function 'print' not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index 65268ac914..549afdc21a 100644 --- a/ext/standard/tests/array/array_map_variation17.phpt +++ b/ext/standard/tests/array/array_map_variation17.phpt @@ -81,62 +81,62 @@ echo "Done"; *** Testing array_map() : unexpected values for 'callback' argument *** -- Iteration 1 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 2 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 3 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 4 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 5 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 6 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 7 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 8 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 9 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 10 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 11 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 12 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 13 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 14 -- -array_map() expects argument #1 ($callback) to be a valid callback, function '' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name -- Iteration 15 -- -array_map() expects argument #1 ($callback) to be a valid callback, function '' not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name -- Iteration 16 -- -array_map() expects argument #1 ($callback) to be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members -- Iteration 17 -- -array_map() expects argument #1 ($callback) to be a valid callback, first array member is not a valid class name or object +array_map(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object -- Iteration 18 -- -array_map() expects argument #1 ($callback) to be a valid callback, first array member is not a valid class name or object +array_map(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object -- Iteration 19 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given -- Iteration 20 -- -array_map() expects argument #1 ($callback) to be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback, no array or string given Done diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt index ad356ba01d..4ff919d8a8 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() expects argument #2 ($haystack) to be of type array, object given -array_search() expects argument #2 ($haystack) to 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, object given int(1) Done diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index 270206a747..7769f32e41 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -61,6 +61,6 @@ array(1) { [2]=> int(3) } -array_slice() expects argument #3 ($length) to be of type int, string given -array_slice() expects argument #3 ($length) to be of type int, string given +array_slice(): Argument #3 ($length) must be of type int, string given +array_slice(): Argument #3 ($length) must be of type int, string given string(3) "foo" diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index 7800a9f6f5..2c95b5a6d0 100644 --- a/ext/standard/tests/array/array_walk_objects.phpt +++ b/ext/standard/tests/array/array_walk_objects.phpt @@ -43,5 +43,5 @@ string(10) "%r\0%r*%r\0%rvar_pro" string(14) "test_protected" string(7) "var_pub" string(11) "test_public" -array_walk() expects argument #1 ($input) to be of type array, string given +array_walk(): Argument #1 ($input) must be of type array, string given Done diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt Binary files differindex 0d0cdcbdc8..4577e1af0c 100644 --- a/ext/standard/tests/array/array_walk_rec_objects.phpt +++ b/ext/standard/tests/array/array_walk_rec_objects.phpt diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt index 2d80cf9e24..8fc09f562c 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt @@ -40,5 +40,5 @@ bool(true) -- With 'min' built-in function -- bool(true) -- With 'echo' language construct -- -array_walk_recursive() expects argument #2 ($funcname) to be a valid callback, function 'echo' not found or invalid function name +array_walk_recursive(): Argument #2 ($funcname) must be a valid callback, function 'echo' not found or invalid function name Done diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt index f95bc43e9d..0a311dd613 100644 --- a/ext/standard/tests/array/array_walk_variation8.phpt +++ b/ext/standard/tests/array/array_walk_variation8.phpt @@ -40,5 +40,5 @@ bool(true) -- With 'min' built-in function -- bool(true) -- With 'echo' language construct -- -array_walk() expects argument #2 ($funcname) to be a valid callback, function 'echo' not found or invalid function name +array_walk(): Argument #2 ($funcname) must be a valid callback, function 'echo' not found or invalid function name Done diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt index a87c5098ab..9ad8f7e280 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() expects argument #1 ($arg) to be of type array, object given +array_unique(): Argument #1 ($arg) must be of type array, object given Done diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index 09549d94c3..2e6bd0330e 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() expects argument #2 ($haystack) to be of type array, object given -in_array() expects argument #2 ($haystack) to 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, object given bool(true) Done diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt index 73a02697e7..0bb3365582 100644 --- a/ext/standard/tests/array/range_errors.phpt +++ b/ext/standard/tests/array/range_errors.phpt @@ -105,15 +105,15 @@ Step exceeds the specified range -- Testing other conditions -- Step exceeds the specified range -range() expects argument #3 ($step) to be of type int|float, string given +range(): Argument #3 ($step) must be of type int|float, string given Step exceeds the specified range Notice: A non well formed numeric value encountered in %s on line %d Step exceeds the specified range -- Testing Invalid steps -- -range() expects argument #3 ($step) to be of type int|float, string given +range(): Argument #3 ($step) must be of type int|float, string given Step exceeds the specified range Step exceeds the specified range -range() expects argument #3 ($step) to be of type int|float, string given -range() expects argument #3 ($step) to be of type int|float, string given +range(): Argument #3 ($step) must be of type int|float, string given +range(): Argument #3 ($step) must be of type int|float, string given diff --git a/ext/standard/tests/array/range_variation.phpt b/ext/standard/tests/array/range_variation.phpt index e924a2784a..0459634b54 100644 --- a/ext/standard/tests/array/range_variation.phpt +++ b/ext/standard/tests/array/range_variation.phpt @@ -615,5 +615,5 @@ array(5) { [4]=> int(5) } -range() expects argument #3 ($step) to be of type int|float, array given +range(): Argument #3 ($step) must be of type int|float, array given Done diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt index b7ae000c01..985a468680 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -85,80 +85,80 @@ Warning: Undefined variable: undefined_var in %s on line %d Warning: Undefined variable: unset_var in %s on line %d Arg value: 0 (type: integer) -get_class() expects argument #1 ($object) to be of type object, int given +get_class(): Argument #1 ($object) must be of type object, int given Arg value: 1 (type: integer) -get_class() expects argument #1 ($object) to be of type object, int given +get_class(): Argument #1 ($object) must be of type object, int given Arg value: 12345 (type: integer) -get_class() expects argument #1 ($object) to be of type object, int given +get_class(): Argument #1 ($object) must be of type object, int given Arg value: -2345 (type: integer) -get_class() expects argument #1 ($object) to be of type object, int given +get_class(): Argument #1 ($object) must be of type object, int given Arg value: 10.5 (type: double) -get_class() expects argument #1 ($object) to be of type object, float given +get_class(): Argument #1 ($object) must be of type object, float given Arg value: -10.5 (type: double) -get_class() expects argument #1 ($object) to be of type object, float given +get_class(): Argument #1 ($object) must be of type object, float given Arg value: 101234567000 (type: double) -get_class() expects argument #1 ($object) to be of type object, float given +get_class(): Argument #1 ($object) must be of type object, float given Arg value: 1.07654321E-9 (type: double) -get_class() expects argument #1 ($object) to be of type object, float given +get_class(): Argument #1 ($object) must be of type object, float given Arg value: 0.5 (type: double) -get_class() expects argument #1 ($object) to be of type object, float given +get_class(): Argument #1 ($object) must be of type object, float given Arg value: Array (type: array) -get_class() expects argument #1 ($object) to be of type object, array given +get_class(): Argument #1 ($object) must be of type object, array given Arg value: Array (type: array) -get_class() expects argument #1 ($object) to be of type object, array given +get_class(): Argument #1 ($object) must be of type object, array given Arg value: Array (type: array) -get_class() expects argument #1 ($object) to be of type object, array given +get_class(): Argument #1 ($object) must be of type object, array given Arg value: Array (type: array) -get_class() expects argument #1 ($object) to be of type object, array given +get_class(): Argument #1 ($object) must be of type object, array given Arg value: Array (type: array) -get_class() expects argument #1 ($object) to be of type object, array given +get_class(): Argument #1 ($object) must be of type object, array given Arg value: (type: NULL) -get_class() expects argument #1 ($object) to be of type object, null given +get_class(): Argument #1 ($object) must be of type object, null given Arg value: (type: NULL) -get_class() expects argument #1 ($object) to be of type object, null given +get_class(): Argument #1 ($object) must be of type object, null given Arg value: 1 (type: boolean) -get_class() expects argument #1 ($object) to be of type object, bool given +get_class(): Argument #1 ($object) must be of type object, bool given Arg value: (type: boolean) -get_class() expects argument #1 ($object) to be of type object, bool given +get_class(): Argument #1 ($object) must be of type object, bool given Arg value: 1 (type: boolean) -get_class() expects argument #1 ($object) to be of type object, bool given +get_class(): Argument #1 ($object) must be of type object, bool given Arg value: (type: boolean) -get_class() expects argument #1 ($object) to be of type object, bool given +get_class(): Argument #1 ($object) must be of type object, bool given Arg value: (type: string) -get_class() expects argument #1 ($object) to be of type object, string given +get_class(): Argument #1 ($object) must be of type object, string given Arg value: (type: string) -get_class() expects argument #1 ($object) to be of type object, string given +get_class(): Argument #1 ($object) must be of type object, string given Arg value: string (type: string) -get_class() expects argument #1 ($object) to be of type object, string given +get_class(): Argument #1 ($object) must be of type object, string given Arg value: string (type: string) -get_class() expects argument #1 ($object) to be of type object, string given +get_class(): Argument #1 ($object) must be of type object, string given Arg value: (type: NULL) -get_class() expects argument #1 ($object) to be of type object, null given +get_class(): Argument #1 ($object) must be of type object, null given Arg value: (type: NULL) -get_class() expects argument #1 ($object) to be of type object, null given +get_class(): Argument #1 ($object) must be of type object, null given Done diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index 18d63b8a44..1195d422a4 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -146,15 +146,15 @@ bool(true) bool(true) 43567 -- Iteration 12 -- -chmod() expects argument #2 ($mode) to be of type int, string given -chmod() expects argument #2 ($mode) to be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given -- Iteration 13 -- -chmod() expects argument #2 ($mode) to be of type int, string given -chmod() expects argument #2 ($mode) to be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given -- Iteration 14 -- -chmod() expects argument #2 ($mode) to be of type int, string given -chmod() expects argument #2 ($mode) to be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given -- Iteration 15 -- -chmod() expects argument #2 ($mode) to be of type int, string given -chmod() expects argument #2 ($mode) to be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given +chmod(): Argument #2 ($mode) must be of type int, string given *** Done *** diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt index a4eb48def3..982367cccb 100644 --- a/ext/standard/tests/file/bug39863.phpt +++ b/ext/standard/tests/file/bug39863.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECT-- -file_exists() expects argument #1 ($filename) to be a valid path, string given +file_exists(): Argument #1 ($filename) must be a valid path, string given diff --git a/ext/standard/tests/file/chgrp.phpt b/ext/standard/tests/file/chgrp.phpt index 9950c9e3fc..37ae20d40e 100644 --- a/ext/standard/tests/file/chgrp.phpt +++ b/ext/standard/tests/file/chgrp.phpt @@ -14,4 +14,4 @@ try { } ?> --EXPECT-- -chgrp() expects argument #2 ($group) to be of type string|int, null given +chgrp(): Argument #2 ($group) must be of type string|int, null given diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index 9e8d0cd180..e7aacfdeac 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -110,19 +110,19 @@ float(%d) float(%d) -- Iteration 9 -- -disk_free_space() expects argument #1 ($directory) to be a valid path, string given -diskfreespace() expects argument #1 ($directory) to be a valid path, string given +disk_free_space(): Argument #1 ($directory) must be a valid path, string given +diskfreespace(): Argument #1 ($directory) must be a valid path, string given -- Iteration 10 -- -disk_free_space() expects argument #1 ($directory) to be a valid path, string given -diskfreespace() expects argument #1 ($directory) to be a valid path, string given +disk_free_space(): Argument #1 ($directory) must be a valid path, string given +diskfreespace(): Argument #1 ($directory) must be a valid path, string given -- Iteration 11 -- -disk_free_space() expects argument #1 ($directory) to be a valid path, string given -diskfreespace() expects argument #1 ($directory) to be a valid path, string given +disk_free_space(): Argument #1 ($directory) must be a valid path, string given +diskfreespace(): Argument #1 ($directory) must be a valid path, string given -- Iteration 12 -- -disk_free_space() expects argument #1 ($directory) to be a valid path, string given -diskfreespace() expects argument #1 ($directory) to be a valid path, string given +disk_free_space(): Argument #1 ($directory) must be a valid path, string given +diskfreespace(): Argument #1 ($directory) must be a valid path, string given --- Done --- diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index b5f5119c03..16275e7f39 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -102,16 +102,16 @@ float(%d) float(%d) -- Iteration 9 -- -disk_total_space() expects argument #1 ($directory) to be a valid path, string given +disk_total_space(): Argument #1 ($directory) must be a valid path, string given -- Iteration 10 -- -disk_total_space() expects argument #1 ($directory) to be a valid path, string given +disk_total_space(): Argument #1 ($directory) must be a valid path, string given -- Iteration 11 -- -disk_total_space() expects argument #1 ($directory) to be a valid path, string given +disk_total_space(): Argument #1 ($directory) must be a valid path, string given -- Iteration 12 -- -disk_total_space() expects argument #1 ($directory) to be a valid path, string given +disk_total_space(): Argument #1 ($directory) must be a valid path, string given *** Testing with Binary Input *** float(%s) diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index 878fa1a7c5..12814304d0 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -82,10 +82,10 @@ Warning: file_get_contents( ): Failed to open stream: Permission denied in %s on bool(false) -- Filename: \0 -- -file_get_contents() expects argument #1 ($filename) to be a valid path, string given +file_get_contents(): Argument #1 ($filename) must be a valid path, string given -- Filename: array() -- -file_get_contents() expects argument #1 ($filename) to be a valid path, array given +file_get_contents(): Argument #1 ($filename) must be a valid path, array given -- Filename: /no/such/file/dir -- diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index c2bb209461..058f3bf7e0 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -75,9 +75,9 @@ bool(false) Warning: file_get_contents( ): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -file_get_contents() expects argument #1 ($filename) to be a valid path, string given +file_get_contents(): Argument #1 ($filename) must be a valid path, string given -- Iteration 7 -- -file_get_contents() expects argument #1 ($filename) to be a valid path, array given +file_get_contents(): Argument #1 ($filename) must be a valid path, array given -- Iteration 8 -- Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 310d6abb86..438fcb6903 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -82,10 +82,10 @@ Warning: file_put_contents( ): Failed to open stream: Permission denied in %s on Failed to write data to: " " -- Filename: \0 -- -file_put_contents() expects argument #1 ($filename) to be a valid path, string given +file_put_contents(): Argument #1 ($filename) must be a valid path, string given -- Filename: array() -- -file_put_contents() expects argument #1 ($filename) to be a valid path, array given +file_put_contents(): Argument #1 ($filename) must be a valid path, array given -- Filename: /no/such/file/dir -- diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt index 5b8c156a94..1a55621c3f 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt @@ -81,9 +81,9 @@ Failed to write data to: -- Iteration 5 -- 9 bytes written to: -- Iteration 6 -- -file_put_contents() expects argument #1 ($filename) to be a valid path, string given +file_put_contents(): Argument #1 ($filename) must be a valid path, string given -- Iteration 7 -- -file_put_contents() expects argument #1 ($filename) to be a valid path, array given +file_put_contents(): Argument #1 ($filename) must be a valid path, array given -- Iteration 8 -- Warning: file_put_contents(%sdir): Failed to open stream: %s in %s on line %d diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt index aff47ef1c9..51c0a33861 100644 --- a/ext/standard/tests/file/filegroup_variation3.phpt +++ b/ext/standard/tests/file/filegroup_variation3.phpt @@ -78,8 +78,8 @@ bool(false) Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d bool(false) - Iteration 7 - -filegroup() expects argument #1 ($filename) to be a valid path, string given +filegroup(): Argument #1 ($filename) must be a valid path, string given - Iteration 8 - -filegroup() expects argument #1 ($filename) to be a valid path, string given +filegroup(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt index b8ed3962df..bb3dafd52d 100644 --- a/ext/standard/tests/file/fileinode_variation3.phpt +++ b/ext/standard/tests/file/fileinode_variation3.phpt @@ -79,8 +79,8 @@ bool(false) Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d bool(false) - Iteration 7 - -fileinode() expects argument #1 ($filename) to be a valid path, string given +fileinode(): Argument #1 ($filename) must be a valid path, string given - Iteration 8 - -fileinode() expects argument #1 ($filename) to be a valid path, string given +fileinode(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt index 8768f9d69b..b7de38ec6f 100644 --- a/ext/standard/tests/file/fileowner_variation3.phpt +++ b/ext/standard/tests/file/fileowner_variation3.phpt @@ -79,8 +79,8 @@ bool(false) Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d bool(false) - Iteration 7 - -fileowner() expects argument #1 ($filename) to be a valid path, string given +fileowner(): Argument #1 ($filename) must be a valid path, string given - Iteration 8 - -fileowner() expects argument #1 ($filename) to be a valid path, string given +fileowner(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt index e58594e7d1..73c00130d1 100644 --- a/ext/standard/tests/file/fileperms_variation3.phpt +++ b/ext/standard/tests/file/fileperms_variation3.phpt @@ -78,8 +78,8 @@ bool(false) Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d bool(false) - Iteration 7 - -fileperms() expects argument #1 ($filename) to be a valid path, string given +fileperms(): Argument #1 ($filename) must be a valid path, string given - Iteration 8 - -fileperms() expects argument #1 ($filename) to be a valid path, string given +fileperms(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 9eb5958dbb..dc9123543d 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -65,13 +65,13 @@ Illegal operation argument --- Iteration 3 --- Illegal operation argument --- Iteration 4 --- -flock() expects argument #2 ($operation) to be of type int, array given +flock(): Argument #2 ($operation) must be of type int, array given --- Iteration 5 --- -flock() expects argument #2 ($operation) to be of type int, array given +flock(): Argument #2 ($operation) must be of type int, array given --- Iteration 6 --- -flock() expects argument #2 ($operation) to be of type int, string given +flock(): Argument #2 ($operation) must be of type int, string given --- Iteration 7 --- -flock() expects argument #2 ($operation) to be of type int, string given +flock(): Argument #2 ($operation) must be of type int, string given --- Iteration 8 --- -flock() expects argument #2 ($operation) to be of type int, string given +flock(): Argument #2 ($operation) must be of type int, string given flock(): supplied resource is not a valid stream resource diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index 32bb6b32a6..746d49747d 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -191,9 +191,9 @@ bool(false) -- Iteration 22 -- bool(false) -- Iteration 23 -- -fnmatch() expects argument #1 ($pattern) to be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 24 -- -fnmatch() expects argument #1 ($pattern) to be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 25 -- bool(false) -- Iteration 26 -- @@ -267,44 +267,44 @@ bool(true) --- With Strings --- -- Iteration 0 -- bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(true) -- Iteration 1 -- -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 2 -- bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(true) -- Iteration 3 -- -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 4 -- bool(false) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(true) bool(false) -- Iteration 5 -- bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(true) @@ -405,42 +405,42 @@ bool(true) bool(true) bool(true) bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(false) -- Iteration 1 -- bool(true) bool(true) bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(false) -- Iteration 2 -- bool(true) bool(true) bool(true) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(false) -- Iteration 3 -- -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given -fnmatch() expects argument #1 ($pattern) to be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given +fnmatch(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 4 -- bool(false) bool(false) bool(false) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(true) bool(false) -- Iteration 5 -- bool(false) bool(false) bool(false) -fnmatch() expects argument #2 ($filename) to be a valid path, string given +fnmatch(): Argument #2 ($filename) must be a valid path, string given bool(false) bool(true) diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 234022dd6b..10a43df24a 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -97,21 +97,21 @@ file in root Warning: fopen(c\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --\-- Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --/-- Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:fopen10.tmpdirTwo-- file in fopen10.tmpdirTwo @@ -121,7 +121,7 @@ file in fopen10.tmpdirTwo Warning: fopen(c:adir\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:\/-- file in root @@ -143,4 +143,4 @@ file in fopen10.tmpDir Warning: fopen(/sortout\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 61879edf76..91c3cf1cd6 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -95,21 +95,21 @@ file in root Warning: fopen(c\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --\-- Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --/-- Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:fopen11.tmpdirTwo-- file in fopen11.tmpdirTwo @@ -119,7 +119,7 @@ file in fopen11.tmpdirTwo Warning: fopen(c:adir\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:\/-- file in root @@ -141,4 +141,4 @@ file in fopen11.tmpDir Warning: fopen(/sortout\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects argument #1 to be of type resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/glob_variation-win32-mb.phpt b/ext/standard/tests/file/glob_variation-win32-mb.phpt index 814f18a71d..0997eb30e0 100644 --- a/ext/standard/tests/file/glob_variation-win32-mb.phpt +++ b/ext/standard/tests/file/glob_variation-win32-mb.phpt @@ -334,7 +334,7 @@ array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { @@ -437,7 +437,7 @@ array(1) { array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { } diff --git a/ext/standard/tests/file/glob_variation-win32.phpt b/ext/standard/tests/file/glob_variation-win32.phpt index 966d2b28e0..eb30a13923 100644 --- a/ext/standard/tests/file/glob_variation-win32.phpt +++ b/ext/standard/tests/file/glob_variation-win32.phpt @@ -333,7 +333,7 @@ array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { @@ -436,7 +436,7 @@ array(1) { array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { } diff --git a/ext/standard/tests/file/glob_variation.phpt b/ext/standard/tests/file/glob_variation.phpt index 655b3efe78..1fcd56eeaf 100644 --- a/ext/standard/tests/file/glob_variation.phpt +++ b/ext/standard/tests/file/glob_variation.phpt @@ -336,7 +336,7 @@ array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { @@ -439,7 +439,7 @@ array(1) { array(0) { } -- Iteration 8 -- -glob() expects argument #1 ($pattern) to be a valid path, string given +glob(): Argument #1 ($pattern) must be a valid path, string given -- Iteration 9 -- array(0) { } diff --git a/ext/standard/tests/file/is_dir_variation4.phpt b/ext/standard/tests/file/is_dir_variation4.phpt index f527974d90..111699bd86 100644 --- a/ext/standard/tests/file/is_dir_variation4.phpt +++ b/ext/standard/tests/file/is_dir_variation4.phpt @@ -81,9 +81,9 @@ bool(true) bool(false) -- Iteration 9 -- -is_dir() expects argument #1 ($filename) to be a valid path, string given +is_dir(): Argument #1 ($filename) must be a valid path, string given -- Iteration 10 -- -is_dir() expects argument #1 ($filename) to be a valid path, string given +is_dir(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt index 9dadbd6b0a..0f7e5ba7b1 100644 --- a/ext/standard/tests/file/is_executable_variation1.phpt +++ b/ext/standard/tests/file/is_executable_variation1.phpt @@ -80,9 +80,9 @@ bool(false) -- Iteration 5 -- bool(false) -- Iteration 6 -- -is_executable() expects argument #1 ($filename) to be a valid path, string given +is_executable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 7 -- -is_executable() expects argument #1 ($filename) to be a valid path, string given +is_executable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 8 -- bool(false) -- Iteration 9 -- diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt index 5651c5fc02..81804030a0 100644 --- a/ext/standard/tests/file/is_file_variation4.phpt +++ b/ext/standard/tests/file/is_file_variation4.phpt @@ -71,8 +71,8 @@ bool(false) - Iteration 6 - bool(false) - Iteration 7 - -is_file() expects argument #1 ($filename) to be a valid path, string given +is_file(): Argument #1 ($filename) must be a valid path, string given - Iteration 8 - -is_file() expects argument #1 ($filename) to be a valid path, string given +is_file(): Argument #1 ($filename) must be a valid path, string given *** Done *** diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt index 102f9b177c..95dd003874 100644 --- a/ext/standard/tests/file/is_readable_variation1.phpt +++ b/ext/standard/tests/file/is_readable_variation1.phpt @@ -81,11 +81,11 @@ bool(false) -- Iteration 6 -- bool(false) -- Iteration 7 -- -is_readable() expects argument #1 ($filename) to be a valid path, string given +is_readable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 8 -- -is_readable() expects argument #1 ($filename) to be a valid path, string given +is_readable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 9 -- -is_readable() expects argument #1 ($filename) to be a valid path, string given +is_readable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 10 -- bool(true) -- Iteration 11 -- diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt index 53090a9f80..333294e073 100644 --- a/ext/standard/tests/file/is_writable_variation1.phpt +++ b/ext/standard/tests/file/is_writable_variation1.phpt @@ -92,14 +92,14 @@ bool(false) bool(false) bool(false) -- Iteration 7 -- -is_writable() expects argument #1 ($filename) to be a valid path, string given -is_writeable() expects argument #1 ($filename) to be a valid path, string given +is_writable(): Argument #1 ($filename) must be a valid path, string given +is_writeable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 8 -- -is_writable() expects argument #1 ($filename) to be a valid path, string given -is_writeable() expects argument #1 ($filename) to be a valid path, string given +is_writable(): Argument #1 ($filename) must be a valid path, string given +is_writeable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 9 -- -is_writable() expects argument #1 ($filename) to be a valid path, string given -is_writeable() expects argument #1 ($filename) to be a valid path, string given +is_writable(): Argument #1 ($filename) must be a valid path, string given +is_writeable(): Argument #1 ($filename) must be a valid path, string given -- Iteration 10 -- bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt index bcf83fb2bc..176ad79070 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt @@ -63,8 +63,8 @@ Warning: rmdir(%s/mkdir_variation2/): %s on line %d bool(false) *** Testing mkdir() and rmdir() for binary safe functionality *** -mkdir() expects argument #1 ($pathname) to be a valid path, string given -rmdir() expects argument #1 ($dirname) to be a valid path, string given +mkdir(): Argument #1 ($pathname) must be a valid path, string given +rmdir(): Argument #1 ($dirname) must be a valid path, string given *** Testing mkdir() with miscellaneous input *** bool(true) diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 02fa1266fd..4934b8cf00 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -75,10 +75,10 @@ Warning: readfile(): Filename cannot be empty in %s on line %d Warning: readfile( ): Failed to open stream: Permission denied in %s on line %d -- Filename: \0 -- -readfile() expects argument #1 ($filename) to be a valid path, string given +readfile(): Argument #1 ($filename) must be a valid path, string given -- Filename: array() -- -readfile() expects argument #1 ($filename) to be a valid path, array given +readfile(): Argument #1 ($filename) must be a valid path, array given -- Filename: /no/such/file/dir -- diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt Binary files differindex f735ba5b58..87892a4519 100644 --- a/ext/standard/tests/file/readfile_variation10.phpt +++ b/ext/standard/tests/file/readfile_variation10.phpt diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt index fd362a6ea0..7805db41de 100644 --- a/ext/standard/tests/file/stream_rfc2397_006.phpt +++ b/ext/standard/tests/file/stream_rfc2397_006.phpt @@ -23,8 +23,8 @@ foreach($streams as $stream) ?> --EXPECTF-- -file_get_contents() expects argument #1 ($filename) to be a valid path, string given -file_get_contents() expects argument #1 ($filename) to be a valid path, string given +file_get_contents(): Argument #1 ($filename) must be a valid path, string given +file_get_contents(): Argument #1 ($filename) must be a valid path, string given Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhcg==): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt index 1639cebe99..dafc626659 100644 --- a/ext/standard/tests/file/tempnam_variation3-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt @@ -110,9 +110,9 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam Failed, not created in the correct directory %s vs %s 0 -- Iteration 6 -- -tempnam() expects argument #2 ($prefix) to be a valid path, string given +tempnam(): Argument #2 ($prefix) must be a valid path, string given -- Iteration 7 -- -tempnam() expects argument #2 ($prefix) to be a valid path, array given +tempnam(): Argument #2 ($prefix) must be a valid path, array given -- Iteration 8 -- OK -- Iteration 9 -- diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt index b255b32f41..a4271b1370 100644 --- a/ext/standard/tests/file/tempnam_variation3.phpt +++ b/ext/standard/tests/file/tempnam_variation3.phpt @@ -106,9 +106,9 @@ File name is => %s/%s File permissions are => 100600 File created in => directory specified -- Iteration 6 -- -tempnam() expects argument #2 ($prefix) to be a valid path, string given +tempnam(): Argument #2 ($prefix) must be a valid path, string given -- Iteration 7 -- -tempnam() expects argument #2 ($prefix) to be a valid path, array given +tempnam(): Argument #2 ($prefix) must be a valid path, array given -- Iteration 8 -- File name is => %s/dir%s File permissions are => 100600 diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 069b2f369d..b9377e6c67 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -100,9 +100,9 @@ File name is => %s%et%s File permissions are => 100666 File created in => temp dir -- Iteration 6 -- -tempnam() expects argument #1 ($dir) to be a valid path, string given +tempnam(): Argument #1 ($dir) must be a valid path, string given -- Iteration 7 -- -tempnam() expects argument #1 ($dir) to be a valid path, array given +tempnam(): Argument #1 ($dir) must be a valid path, array given -- Iteration 8 -- Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index 5ee1d80c7d..a6895c706b 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -105,9 +105,9 @@ File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 File created in => temp dir -- Iteration 6 -- -tempnam() expects argument #1 ($dir) to be a valid path, string given +tempnam(): Argument #1 ($dir) must be a valid path, string given -- Iteration 7 -- -tempnam() expects argument #1 ($dir) to be a valid path, array given +tempnam(): Argument #1 ($dir) must be a valid path, array given -- Iteration 8 -- Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7.php on line %d diff --git a/ext/standard/tests/file/windows_links/bug78862.phpt b/ext/standard/tests/file/windows_links/bug78862.phpt index 70a26c1d5f..ce4da1fc8c 100644 --- a/ext/standard/tests/file/windows_links/bug78862.phpt +++ b/ext/standard/tests/file/windows_links/bug78862.phpt @@ -7,7 +7,7 @@ var_dump(link(__DIR__ . "/bug78862.target\0more", __DIR__ . "/bug78862.link\0mor var_dump(file_exists(__DIR__ . '/bug78862.link')); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: link() expects argument #1 ($target) to be a valid path, string given in %s:%d +Fatal error: Uncaught TypeError: link(): Argument #1 ($target) must be a valid path, string given in %s:%d Stack trace: #0 %s(%d): link('%s', '%s') #1 {main} diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt index 211ad3b2d3..87401fdc67 100644 --- a/ext/standard/tests/general_functions/bug41970.phpt +++ b/ext/standard/tests/general_functions/bug41970.phpt @@ -21,11 +21,11 @@ try { echo "Done\n"; ?> --EXPECTF-- -Warning: sort() expects argument #1 ($arg) to be passed by reference, value given in %s on line %d +Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d bool(true) -strlen() expects argument #1 ($str) to be of type string, array given +strlen(): Argument #1 ($str) must be of type string, array given -Warning: sort() expects argument #1 ($arg) to be passed by reference, value given in %s on line %d +Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d bool(true) -strlen() expects argument #1 ($str) to be of type string, array given +strlen(): Argument #1 ($str) must be of type string, array given Done diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_001.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_001.phpt index 1f2abbae29..cd76dc79e3 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_001.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_001.phpt @@ -42,7 +42,7 @@ array(1) { } ------ Calling by_ref() with unreferenced argument ------ -Warning: by_ref() expects argument #1 ($arg) to be passed by reference, value given in %s on line %d +Warning: by_ref(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d array(1) { [0]=> string(8) "original" diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt index b667da66c9..67afab6345 100644 --- a/ext/standard/tests/general_functions/callbacks_001.phpt +++ b/ext/standard/tests/general_functions/callbacks_001.phpt @@ -83,7 +83,7 @@ $o = new P; $o->test(); ?> ---EXPECTF-- +--EXPECT-- parent|who B C|parent::who @@ -106,4 +106,4 @@ O $this|O::who O $this|B::who -call_user_func() expects argument #1 ($function) to be a valid callback, class 'P' is not a subclass of 'B' +call_user_func(): Argument #1 ($function) must be a valid callback, class 'P' is not a subclass of 'B' diff --git a/ext/standard/tests/general_functions/callbacks_002.phpt b/ext/standard/tests/general_functions/callbacks_002.phpt index 4f327e3b86..f69a886ad3 100644 --- a/ext/standard/tests/general_functions/callbacks_002.phpt +++ b/ext/standard/tests/general_functions/callbacks_002.phpt @@ -20,7 +20,7 @@ try { } ?> ---EXPECTF-- -call_user_func() expects argument #1 ($function) to be a valid callback, class 'Foo' not found -call_user_func() expects argument #1 ($function) to be a valid callback, first array member is not a valid class name or object -call_user_func() expects argument #1 ($function) to be a valid callback, second array member is not a valid method +--EXPECT-- +call_user_func(): Argument #1 ($function) must be a valid callback, class 'Foo' not found +call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($function) must be a valid callback, second array member is not a valid method diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index e635fa2fca..f6ebeba2ef 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -105,25 +105,25 @@ int(1) int(0) -- Iteration 7 -- -abs() expects argument #1 ($number) to be of type int|float, string given +abs(): Argument #1 ($number) must be of type int|float, string given -- Iteration 8 -- -abs() expects argument #1 ($number) to be of type int|float, string given +abs(): Argument #1 ($number) must be of type int|float, string given -- Iteration 9 -- -abs() expects argument #1 ($number) to be of type int|float, array given +abs(): Argument #1 ($number) must be of type int|float, array given -- Iteration 10 -- -abs() expects argument #1 ($number) to be of type int|float, string given +abs(): Argument #1 ($number) must be of type int|float, string given -- Iteration 11 -- -abs() expects argument #1 ($number) to be of type int|float, string given +abs(): Argument #1 ($number) must be of type int|float, string given -- Iteration 12 -- -abs() expects argument #1 ($number) to be of type int|float, string given +abs(): Argument #1 ($number) must be of type int|float, string given -- Iteration 13 -- -abs() expects argument #1 ($number) to be of type int|float, object given +abs(): Argument #1 ($number) must be of type int|float, object given -- Iteration 14 -- int(0) @@ -132,4 +132,4 @@ int(0) int(0) -- Iteration 16 -- -abs() expects argument #1 ($number) to be of type int|float, resource given +abs(): Argument #1 ($number) must be of type int|float, resource given diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 9a29aa3480..d219f31302 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -151,7 +151,7 @@ int(0) int(0) -- Iteration 18 -- -bindec() expects argument #1 ($binary_string) to be of type string, array given +bindec(): Argument #1 ($binary_string) must be of type string, array given -- Iteration 19 -- @@ -175,4 +175,4 @@ int(0) int(0) -- Iteration 24 -- -bindec() expects argument #1 ($binary_string) to be of type string, resource given +bindec(): Argument #1 ($binary_string) must be of type string, resource given diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index 16f205f29f..695c3f36ba 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -151,7 +151,7 @@ int(0) int(0) -- Iteration 18 -- -bindec() expects argument #1 ($binary_string) to be of type string, array given +bindec(): Argument #1 ($binary_string) must be of type string, array given -- Iteration 19 -- @@ -175,4 +175,4 @@ int(0) int(0) -- Iteration 24 -- -bindec() expects argument #1 ($binary_string) to be of type string, resource given +bindec(): Argument #1 ($binary_string) must be of type string, resource given diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index 1946c77879..4140738e02 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -98,25 +98,25 @@ float(1) float(0) -- Iteration 7 -- -ceil() expects argument #1 ($number) to be of type int|float, string given +ceil(): Argument #1 ($number) must be of type int|float, string given -- Iteration 8 -- -ceil() expects argument #1 ($number) to be of type int|float, string given +ceil(): Argument #1 ($number) must be of type int|float, string given -- Iteration 9 -- -ceil() expects argument #1 ($number) to be of type int|float, array given +ceil(): Argument #1 ($number) must be of type int|float, array given -- Iteration 10 -- -ceil() expects argument #1 ($number) to be of type int|float, string given +ceil(): Argument #1 ($number) must be of type int|float, string given -- Iteration 11 -- -ceil() expects argument #1 ($number) to be of type int|float, string given +ceil(): Argument #1 ($number) must be of type int|float, string given -- Iteration 12 -- -ceil() expects argument #1 ($number) to be of type int|float, string given +ceil(): Argument #1 ($number) must be of type int|float, string given -- Iteration 13 -- -ceil() expects argument #1 ($number) to be of type int|float, object given +ceil(): Argument #1 ($number) must be of type int|float, object given -- Iteration 14 -- float(0) @@ -125,4 +125,4 @@ float(0) float(0) -- Iteration 16 -- -ceil() expects argument #1 ($number) to be of type int|float, resource given +ceil(): Argument #1 ($number) must be of type int|float, resource given diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index 2aa72337bb..f5b3e98461 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -98,25 +98,25 @@ float(1) float(0) -- Iteration 7 -- -floor() expects argument #1 ($number) to be of type int|float, string given +floor(): Argument #1 ($number) must be of type int|float, string given -- Iteration 8 -- -floor() expects argument #1 ($number) to be of type int|float, string given +floor(): Argument #1 ($number) must be of type int|float, string given -- Iteration 9 -- -floor() expects argument #1 ($number) to be of type int|float, array given +floor(): Argument #1 ($number) must be of type int|float, array given -- Iteration 10 -- -floor() expects argument #1 ($number) to be of type int|float, string given +floor(): Argument #1 ($number) must be of type int|float, string given -- Iteration 11 -- -floor() expects argument #1 ($number) to be of type int|float, string given +floor(): Argument #1 ($number) must be of type int|float, string given -- Iteration 12 -- -floor() expects argument #1 ($number) to be of type int|float, string given +floor(): Argument #1 ($number) must be of type int|float, string given -- Iteration 13 -- -floor() expects argument #1 ($number) to be of type int|float, object given +floor(): Argument #1 ($number) must be of type int|float, object given -- Iteration 14 -- float(0) @@ -125,4 +125,4 @@ float(0) float(0) -- Iteration 16 -- -floor() expects argument #1 ($number) to be of type int|float, resource given +floor(): Argument #1 ($number) must be of type int|float, resource given diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 5df2c7ff06..8b62d9458e 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -157,7 +157,7 @@ int(0) int(0) -- Iteration 20 -- -hexdec() expects argument #1 ($hex_string) to be of type string, array given +hexdec(): Argument #1 ($hex_string) must be of type string, array given -- Iteration 21 -- @@ -181,4 +181,4 @@ int(0) int(0) -- Iteration 26 -- -hexdec() expects argument #1 ($hex_string) to be of type string, resource given +hexdec(): Argument #1 ($hex_string) must be of type string, resource given diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index 6d984502af..86ed97987b 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -157,7 +157,7 @@ int(0) int(0) -- Iteration 20 -- -hexdec() expects argument #1 ($hex_string) to be of type string, array given +hexdec(): Argument #1 ($hex_string) must be of type string, array given -- Iteration 21 -- @@ -181,4 +181,4 @@ int(0) int(0) -- Iteration 26 -- -hexdec() expects argument #1 ($hex_string) to be of type string, resource given +hexdec(): Argument #1 ($hex_string) must be of type string, resource given diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt index 18dfc698ce..1c4ec0ec86 100644 --- a/ext/standard/tests/math/octdec_variation1.phpt +++ b/ext/standard/tests/math/octdec_variation1.phpt @@ -160,7 +160,7 @@ int(0) int(0) -- Iteration 20 -- -octdec() expects argument #1 ($octal_string) to be of type string, array given +octdec(): Argument #1 ($octal_string) must be of type string, array given -- Iteration 21 -- @@ -184,5 +184,5 @@ int(0) int(0) -- Iteration 26 -- -octdec() expects argument #1 ($octal_string) to be of type string, resource given +octdec(): Argument #1 ($octal_string) must be of type string, resource given ---Done--- diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index add8cf7637..5371d0fb94 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -143,25 +143,25 @@ float(1) float(0) -- Iteration 17 -- -round() expects argument #1 ($number) to be of type int|float, string given +round(): Argument #1 ($number) must be of type int|float, string given -- Iteration 18 -- -round() expects argument #1 ($number) to be of type int|float, string given +round(): Argument #1 ($number) must be of type int|float, string given -- Iteration 19 -- -round() expects argument #1 ($number) to be of type int|float, array given +round(): Argument #1 ($number) must be of type int|float, array given -- Iteration 20 -- -round() expects argument #1 ($number) to be of type int|float, string given +round(): Argument #1 ($number) must be of type int|float, string given -- Iteration 21 -- -round() expects argument #1 ($number) to be of type int|float, string given +round(): Argument #1 ($number) must be of type int|float, string given -- Iteration 22 -- -round() expects argument #1 ($number) to be of type int|float, string given +round(): Argument #1 ($number) must be of type int|float, string given -- Iteration 23 -- -round() expects argument #1 ($number) to be of type int|float, object given +round(): Argument #1 ($number) must be of type int|float, object given -- Iteration 24 -- float(0) @@ -170,4 +170,4 @@ float(0) float(0) -- Iteration 26 -- -round() expects argument #1 ($number) to be of type int|float, resource given +round(): Argument #1 ($number) must be of type int|float, resource given 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 dc8def5eef..c3c924b46b 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 Unknown password hashing algorithm: Array -password_hash() expects argument #3 ($options) to be of type array, object given -password_hash() expects argument #3 ($options) to be of type array, string given -password_hash() expects argument #1 ($password) to be of type string, array given +password_hash(): Argument #3 ($options) must be of type array, object 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/password/password_needs_rehash_error.phpt b/ext/standard/tests/password/password_needs_rehash_error.phpt index 688bbb4eb7..0b64b0c82e 100644 --- a/ext/standard/tests/password/password_needs_rehash_error.phpt +++ b/ext/standard/tests/password/password_needs_rehash_error.phpt @@ -29,6 +29,6 @@ echo "OK!"; --EXPECT-- password_needs_rehash() expects at least 2 parameters, 1 given bool(false) -password_needs_rehash() expects argument #1 ($hash) to be of type string, array given -password_needs_rehash() expects argument #3 ($options) to be of type array, string given +password_needs_rehash(): Argument #1 ($hash) must be of type string, array given +password_needs_rehash(): Argument #3 ($options) must be of type array, string given OK! diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt Binary files differindex 6b15319c0e..50a57129e5 100644 --- a/ext/standard/tests/strings/addcslashes_001.phpt +++ b/ext/standard/tests/strings/addcslashes_001.phpt diff --git a/ext/standard/tests/strings/bug54322.phpt b/ext/standard/tests/strings/bug54322.phpt index fd491b2faa..8f12cd80f7 100644 --- a/ext/standard/tests/strings/bug54322.phpt +++ b/ext/standard/tests/strings/bug54322.phpt @@ -9,4 +9,4 @@ try { } ?> --EXPECT-- -get_html_translation_table() expects argument #1 ($table) to be of type int, float given +get_html_translation_table(): Argument #1 ($table) must be of type int, float given diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt Binary files differindex 85690a234e..37af77afd8 100644 --- a/ext/standard/tests/strings/chunk_split_variation5.phpt +++ b/ext/standard/tests/strings/chunk_split_variation5.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt index fe19f325be..9a499067a4 100644 --- a/ext/standard/tests/strings/chunk_split_variation8.phpt +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt @@ -83,6 +83,6 @@ string(129) "This's heredoc string with and It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test chunk_split():::" -- Iteration 7 -- -chunk_split() expects argument #2 ($chunklen) to be of type int, float given +chunk_split(): Argument #2 ($chunklen) must be of type int, float given -- Iteration 8 -- Chunk length should be greater than zero diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt Binary files differindex 4fdb97b6cd..64c31048c8 100644 --- a/ext/standard/tests/strings/implode1.phpt +++ b/ext/standard/tests/strings/implode1.phpt diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index 976dd97242..e77b20c744 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -26,5 +26,5 @@ echo "Done\n"; *** Testing join() : error conditions *** -- Testing join() with less than expected no. of arguments -- -join() expects argument #1 ($pieces) to be of type array, string given +join(): Argument #1 ($pieces) must be of type array, string given Done diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 58cb3d2d11..970d5da330 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -125,15 +125,15 @@ string(29) "element11.07654321E-9element2" -- Iteration 9 -- string(19) "element10.5element2" -- Iteration 10 -- -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given -- Iteration 11 -- -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given -- Iteration 12 -- -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given -- Iteration 13 -- -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given -- Iteration 14 -- -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given -- Iteration 15 -- string(17) "element11element2" -- Iteration 16 -- @@ -153,7 +153,7 @@ string(16) "element1element2" -- Iteration 23 -- string(16) "element1element2" -- Iteration 24 -- -join() expects argument #1 ($glue) to be of type string|array, resource given +join(): Argument #1 ($glue) must be of type string|array, resource given -- Iteration 25 -- string(16) "element1element2" -- Iteration 26 -- diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt index fe52aebeb7..37d9b64e1d 100644 --- a/ext/standard/tests/strings/join_variation2.phpt +++ b/ext/standard/tests/strings/join_variation2.phpt @@ -108,49 +108,49 @@ echo "Done\n"; --- Testing join() by supplying different values for 'pieces' argument --- -- Iteration 1 -- -join() expects argument #2 ($pieces) to be of type array, int given +join(): Argument #2 ($pieces) must be of type array, int given -- Iteration 2 -- -join() expects argument #2 ($pieces) to be of type array, int given +join(): Argument #2 ($pieces) must be of type array, int given -- Iteration 3 -- -join() expects argument #2 ($pieces) to be of type array, int given +join(): Argument #2 ($pieces) must be of type array, int given -- Iteration 4 -- -join() expects argument #2 ($pieces) to be of type array, int given +join(): Argument #2 ($pieces) must be of type array, int given -- Iteration 5 -- -join() expects argument #2 ($pieces) to be of type array, float given +join(): Argument #2 ($pieces) must be of type array, float given -- Iteration 6 -- -join() expects argument #2 ($pieces) to be of type array, float given +join(): Argument #2 ($pieces) must be of type array, float given -- Iteration 7 -- -join() expects argument #2 ($pieces) to be of type array, float given +join(): Argument #2 ($pieces) must be of type array, float given -- Iteration 8 -- -join() expects argument #2 ($pieces) to be of type array, float given +join(): Argument #2 ($pieces) must be of type array, float given -- Iteration 9 -- -join() expects argument #2 ($pieces) to be of type array, float given +join(): Argument #2 ($pieces) must be of type array, float given -- Iteration 10 -- -join() expects argument #2 ($pieces) to be of type array, bool given +join(): Argument #2 ($pieces) must be of type array, bool given -- Iteration 11 -- -join() expects argument #2 ($pieces) to be of type array, bool given +join(): Argument #2 ($pieces) must be of type array, bool given -- Iteration 12 -- -join() expects argument #2 ($pieces) to be of type array, bool given +join(): Argument #2 ($pieces) must be of type array, bool given -- Iteration 13 -- -join() expects argument #2 ($pieces) to be of type array, bool given +join(): Argument #2 ($pieces) must be of type array, bool given -- Iteration 14 -- -join() expects argument #2 ($pieces) to be of type array, string given +join(): Argument #2 ($pieces) must be of type array, string given -- Iteration 15 -- -join() expects argument #2 ($pieces) to be of type array, string given +join(): Argument #2 ($pieces) must be of type array, string given -- Iteration 16 -- -join() expects argument #2 ($pieces) to be of type array, object given +join(): Argument #2 ($pieces) must be of type array, object given -- Iteration 17 -- -join() expects argument #2 ($pieces) to be of type array, string given +join(): Argument #2 ($pieces) must be of type array, string given -- Iteration 18 -- -join() expects argument #2 ($pieces) to be of type array, string given +join(): Argument #2 ($pieces) must be of type array, string given -- Iteration 19 -- -join() expects argument #2 ($pieces) to be of type array, null given +join(): Argument #2 ($pieces) must be of type array, null given -- Iteration 20 -- -join() expects argument #2 ($pieces) to be of type array, null given +join(): Argument #2 ($pieces) must be of type array, null given -- Iteration 21 -- -join() expects argument #2 ($pieces) to be of type array, resource given +join(): Argument #2 ($pieces) must be of type array, resource given -- Iteration 22 -- -join() expects argument #2 ($pieces) to be of type array, null given +join(): Argument #2 ($pieces) must be of type array, null given -- Iteration 23 -- -join() expects argument #2 ($pieces) to be of type array, null given +join(): Argument #2 ($pieces) must be of type array, null given Done diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt Binary files differindex 25ea766421..162576bb93 100644 --- a/ext/standard/tests/strings/join_variation4.phpt +++ b/ext/standard/tests/strings/join_variation4.phpt diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt index 63e884e438..60c1d681e1 100644 --- a/ext/standard/tests/strings/join_variation5.phpt +++ b/ext/standard/tests/strings/join_variation5.phpt @@ -41,7 +41,7 @@ Warning: Array to string conversion in %s on line %d Warning: Array to string conversion in %s on line %d string(27) "ArrayTESTArrayTESTPHPTEST50" -join() expects argument #1 ($glue) to be of type string, array given +join(): Argument #1 ($glue) must be of type string, array given Warning: Array to string conversion in %s on line %d diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index 61dd6b3aa4..8fed7737fc 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -198,29 +198,29 @@ int(3) int(3) -- Iteration 10 -- -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given -- Iteration 11 -- -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given -- Iteration 12 -- -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given -- Iteration 13 -- -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given -- Iteration 14 -- -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given -printf() expects argument #1 ($format) to be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given +printf(): Argument #1 ($format) must be of type string, array given -- Iteration 15 -- @@ -311,6 +311,6 @@ int(0) int(0) -- Iteration 26 -- -printf() expects argument #1 ($format) to be of type string, resource given -printf() expects argument #1 ($format) to be of type string, resource given -printf() expects argument #1 ($format) to be of type string, resource given +printf(): Argument #1 ($format) must be of type string, resource given +printf(): Argument #1 ($format) must be of type string, resource given +printf(): Argument #1 ($format) must be of type string, resource given diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index b1f2395003..56ff4f0b4c 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -166,29 +166,29 @@ string(3) "0.5" string(3) "0.5" -- Iteration 10 -- -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 11 -- -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 12 -- -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 13 -- -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 14 -- -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given -sprintf() expects argument #1 ($format) to be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given +sprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 15 -- string(0) "" @@ -246,7 +246,7 @@ string(0) "" string(0) "" -- Iteration 26 -- -sprintf() expects argument #1 ($format) to be of type string, resource given -sprintf() expects argument #1 ($format) to be of type string, resource given -sprintf() expects argument #1 ($format) to be of type string, resource given +sprintf(): Argument #1 ($format) must be of type string, resource given +sprintf(): Argument #1 ($format) must be of type string, resource given +sprintf(): Argument #1 ($format) must be of type string, resource given Done diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index b093fb691e..25b062d7a1 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -36,6 +36,6 @@ var_dump( str_pad($input, $php_int_max_pad_length) ); ?> --EXPECTF-- *** Testing str_pad() function: with large value for for 'pad_length' argument *** -str_pad() expects argument #2 ($pad_length) to be of type int, float given +str_pad(): Argument #2 ($pad_length) must be of type int, float given Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index 1a0b7d5531..7de2d498bb 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -47,5 +47,5 @@ string(1) "q" int(1) string(0) "" int(0) -str_replace() expects argument #3 ($subject) to be of type string|array, resource given +str_replace(): Argument #3 ($subject) must be of type string|array, resource given resource(%d) of type (stream) diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index d5d56b8208..2245ca422c 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -200,8 +200,8 @@ array(2) { int(1) -- Testing Resources -- -str_replace() expects argument #3 ($subject) to be of type string|array, resource given -str_replace() expects argument #3 ($subject) to be of type string|array, resource given +str_replace(): Argument #3 ($subject) must be of type string|array, resource given +str_replace(): Argument #3 ($subject) must be of type string|array, resource given -- Testing a longer and heredoc string -- string(623) "FOUNDghijklmnopqrstuvwxyz0123456789FOUNDghijklmnopqrstuvwxyz0123456789 diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt index f36c23dfbd..92592de0f5 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -126,19 +126,19 @@ bool(false) int(17) -- Iteration 10 -- -stripos() expects argument #2 ($needle) to be of type string, array given +stripos(): Argument #2 ($needle) must be of type string, array given -- Iteration 11 -- -stripos() expects argument #2 ($needle) to be of type string, array given +stripos(): Argument #2 ($needle) must be of type string, array given -- Iteration 12 -- -stripos() expects argument #2 ($needle) to be of type string, array given +stripos(): Argument #2 ($needle) must be of type string, array given -- Iteration 13 -- -stripos() expects argument #2 ($needle) to be of type string, array given +stripos(): Argument #2 ($needle) must be of type string, array given -- Iteration 14 -- -stripos() expects argument #2 ($needle) to be of type string, array given +stripos(): Argument #2 ($needle) must be of type string, array given -- Iteration 15 -- int(9) @@ -168,7 +168,7 @@ int(0) int(0) -- Iteration 24 -- -stripos() expects argument #2 ($needle) to be of type string, resource given +stripos(): Argument #2 ($needle) must be of type string, resource given -- Iteration 25 -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation11.phpt b/ext/standard/tests/strings/stripos_variation11.phpt index 9746cdb59a..9b7ff24350 100644 --- a/ext/standard/tests/strings/stripos_variation11.phpt +++ b/ext/standard/tests/strings/stripos_variation11.phpt @@ -126,20 +126,20 @@ bool(false) int(0) bool(false) -- Iteration 10 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 11 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 12 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 13 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 14 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 15 -- int(0) bool(false) @@ -168,8 +168,8 @@ ValueError: Offset not contained in string int(0) ValueError: Offset not contained in string -- Iteration 24 -- -TypeError: stripos() expects argument #1 ($haystack) to be of type string, resource given -TypeError: stripos() expects argument #1 ($haystack) to be of type string, resource given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, resource given +TypeError: stripos(): Argument #1 ($haystack) must be of type string, resource given -- Iteration 25 -- int(0) ValueError: Offset not contained in string diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt index 7c25c4032d..27cecec3c2 100644 --- a/ext/standard/tests/strings/stristr_variation2.phpt +++ b/ext/standard/tests/strings/stristr_variation2.phpt @@ -100,11 +100,11 @@ bool(false) -- Iteration 7 -- bool(false) -- Iteration 8 -- -stristr() expects argument #2 ($needle) to be of type string, array given +stristr(): Argument #2 ($needle) must be of type string, array given -- Iteration 9 -- -stristr() expects argument #2 ($needle) to be of type string, array given +stristr(): Argument #2 ($needle) must be of type string, array given -- Iteration 10 -- -stristr() expects argument #2 ($needle) to be of type string, array given +stristr(): Argument #2 ($needle) must be of type string, array given -- Iteration 11 -- bool(false) -- Iteration 12 -- @@ -120,7 +120,7 @@ string(11) "Hello World" -- Iteration 17 -- bool(false) -- Iteration 18 -- -stristr() expects argument #2 ($needle) to be of type string, resource given +stristr(): Argument #2 ($needle) must be of type string, resource given -- Iteration 19 -- string(11) "Hello World" -- Iteration 20 -- diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex 1929b83f74..59162e1822 100644 --- a/ext/standard/tests/strings/strpos.phpt +++ b/ext/standard/tests/strings/strpos.phpt diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 04e96f9714..269c2e09cc 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -154,15 +154,15 @@ string(2) "10" -- Iteration 9 -- bool(false) -- Iteration 10 -- -strrchr() expects argument #2 ($needle) to be of type string, array given +strrchr(): Argument #2 ($needle) must be of type string, array given -- Iteration 11 -- -strrchr() expects argument #2 ($needle) to be of type string, array given +strrchr(): Argument #2 ($needle) must be of type string, array given -- Iteration 12 -- -strrchr() expects argument #2 ($needle) to be of type string, array given +strrchr(): Argument #2 ($needle) must be of type string, array given -- Iteration 13 -- -strrchr() expects argument #2 ($needle) to be of type string, array given +strrchr(): Argument #2 ($needle) must be of type string, array given -- Iteration 14 -- -strrchr() expects argument #2 ($needle) to be of type string, array given +strrchr(): Argument #2 ($needle) must be of type string, array given -- Iteration 15 -- bool(false) -- Iteration 16 -- @@ -182,7 +182,7 @@ bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -strrchr() expects argument #2 ($needle) to be of type string, resource given +strrchr(): Argument #2 ($needle) must be of type string, resource given -- Iteration 25 -- bool(false) -- Iteration 26 -- diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt index 33a34e21ab..7944ff82c6 100644 --- a/ext/standard/tests/strings/strrchr_variation11.phpt +++ b/ext/standard/tests/strings/strrchr_variation11.phpt @@ -113,15 +113,15 @@ string(4) "1E-9" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -strrchr() expects argument #1 ($haystack) to be of type string, array given +strrchr(): Argument #1 ($haystack) must be of type string, array given -- Iteration 11 -- -strrchr() expects argument #1 ($haystack) to be of type string, array given +strrchr(): Argument #1 ($haystack) must be of type string, array given -- Iteration 12 -- -strrchr() expects argument #1 ($haystack) to be of type string, array given +strrchr(): Argument #1 ($haystack) must be of type string, array given -- Iteration 13 -- -strrchr() expects argument #1 ($haystack) to be of type string, array given +strrchr(): Argument #1 ($haystack) must be of type string, array given -- Iteration 14 -- -strrchr() expects argument #1 ($haystack) to be of type string, array given +strrchr(): Argument #1 ($haystack) must be of type string, array given -- Iteration 15 -- string(1) "1" -- Iteration 16 -- @@ -141,7 +141,7 @@ bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -strrchr() expects argument #1 ($haystack) to be of type string, resource given +strrchr(): Argument #1 ($haystack) must be of type string, resource given -- Iteration 25 -- bool(false) -- Iteration 26 -- diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt index f2673ded5b..39d0bf16f8 100644 --- a/ext/standard/tests/strings/strripos_offset.phpt +++ b/ext/standard/tests/strings/strripos_offset.phpt @@ -36,7 +36,7 @@ try { echo "Done\n"; ?> --EXPECT-- -strripos() expects argument #3 ($offset) to be of type int, float given +strripos(): Argument #3 ($offset) must be of type int, float given Offset not contained in string Offset not contained in string Offset not contained in string diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt index 21f0ea7745..13df98e71c 100644 --- a/ext/standard/tests/strings/strrpos_offset.phpt +++ b/ext/standard/tests/strings/strrpos_offset.phpt @@ -36,7 +36,7 @@ try { echo "Done\n"; ?> --EXPECT-- -strrpos() expects argument #3 ($offset) to be of type int, float given +strrpos(): Argument #3 ($offset) must be of type int, float given Offset not contained in string Offset not contained in string Offset not contained in string diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index c14c4643c1..b16d946f6c 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -116,15 +116,15 @@ bool(false) -- Iteration 9 -- int(28) -- Iteration 10 -- -strrpos() expects argument #2 ($needle) to be of type string, array given +strrpos(): Argument #2 ($needle) must be of type string, array given -- Iteration 11 -- -strrpos() expects argument #2 ($needle) to be of type string, array given +strrpos(): Argument #2 ($needle) must be of type string, array given -- Iteration 12 -- -strrpos() expects argument #2 ($needle) to be of type string, array given +strrpos(): Argument #2 ($needle) must be of type string, array given -- Iteration 13 -- -strrpos() expects argument #2 ($needle) to be of type string, array given +strrpos(): Argument #2 ($needle) must be of type string, array given -- Iteration 14 -- -strrpos() expects argument #2 ($needle) to be of type string, array given +strrpos(): Argument #2 ($needle) must be of type string, array given -- Iteration 15 -- int(41) -- Iteration 16 -- @@ -144,7 +144,7 @@ int(87) -- Iteration 23 -- int(87) -- Iteration 24 -- -strrpos() expects argument #2 ($needle) to be of type string, resource given +strrpos(): Argument #2 ($needle) must be of type string, resource given -- Iteration 25 -- int(87) -- Iteration 26 -- diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt index 24d9828581..df0aac0153 100644 --- a/ext/standard/tests/strings/strrpos_variation11.phpt +++ b/ext/standard/tests/strings/strrpos_variation11.phpt @@ -127,20 +127,20 @@ bool(false) int(0) bool(false) -- Iteration 10 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 11 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 12 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 13 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 14 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, array given -- Iteration 15 -- int(0) bool(false) @@ -169,8 +169,8 @@ ValueError: Offset not contained in string int(0) ValueError: Offset not contained in string -- Iteration 24 -- -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, resource given -TypeError: strrpos() expects argument #1 ($haystack) to be of type string, resource given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, resource given +TypeError: strrpos(): Argument #1 ($haystack) must be of type string, resource given -- Iteration 25 -- int(0) ValueError: Offset not contained in string diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 0a44abbb80..785891e422 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -125,7 +125,7 @@ string(6) "012atm" -- Iteration 16 -- string(6) "012ttm" -- Iteration 17 -- -strtr() expects argument #2 ($from) to be of type string|array, resource given +strtr(): Argument #2 ($from) must be of type string|array, resource given -- Iteration 18 -- string(6) "012atm" -- Iteration 19 -- diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt index 5dc910e9be..131682b9a8 100644 --- a/ext/standard/tests/strings/strtr_variation8.phpt +++ b/ext/standard/tests/strings/strtr_variation8.phpt @@ -142,7 +142,7 @@ If two arguments are passed, the second argument must be an array If two arguments are passed, the second argument must be an array -- Iteration 17 -- -strtr() expects argument #2 ($from) to be of type string|array, resource given +strtr(): Argument #2 ($from) must be of type string|array, resource given -- Iteration 18 -- If two arguments are passed, the second argument must be an array diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index 72866ef1a8..16dba223c3 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -43,6 +43,6 @@ unlink( $file ); ?> --EXPECT-- -- Testing vfprintf() function with wrong variable types as argument -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given int(9) string(9) "Foo fake" diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 1279ac3904..4c5fd92d78 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -40,5 +40,5 @@ unlink( $file ); ?> --EXPECT-- -- Testing vfprintf() function with other strangeties -- -vfprintf() expects argument #1 ($handle) to be of type resource, string given +vfprintf(): Argument #1 ($handle) must be of type resource, string given Error found: Argument number must be greater than zero. diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index d181e50eac..f03b6879b1 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -133,19 +133,19 @@ unlink($data_file); -- Iteration 9 -- 0.5 -- Iteration 10 -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given -- Iteration 11 -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given -- Iteration 12 -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given -- Iteration 13 -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given -- Iteration 14 -- -vfprintf() expects argument #2 ($format) to be of type string, array given +vfprintf(): Argument #2 ($format) must be of type string, array given -- Iteration 15 -- @@ -170,4 +170,4 @@ object -- Iteration 25 -- -- Iteration 26 -- -vfprintf() expects argument #2 ($format) to be of type string, resource given +vfprintf(): Argument #2 ($format) must be of type string, resource given diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 51c3c8985e..742c9cfadc 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -143,19 +143,19 @@ int(13) int(3) -- Iteration 10 -- -vprintf() expects argument #1 ($format) to be of type string, array given +vprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 11 -- -vprintf() expects argument #1 ($format) to be of type string, array given +vprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 12 -- -vprintf() expects argument #1 ($format) to be of type string, array given +vprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 13 -- -vprintf() expects argument #1 ($format) to be of type string, array given +vprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 14 -- -vprintf() expects argument #1 ($format) to be of type string, array given +vprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 15 -- @@ -202,4 +202,4 @@ int(0) int(0) -- Iteration 26 -- -vprintf() expects argument #1 ($format) to be of type string, resource given +vprintf(): Argument #1 ($format) must be of type string, resource given diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 15155a0626..5366b40325 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -132,19 +132,19 @@ string(13) "1.07654321E-9" string(3) "0.5" -- Iteration 10 -- -vsprintf() expects argument #1 ($format) to be of type string, array given +vsprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 11 -- -vsprintf() expects argument #1 ($format) to be of type string, array given +vsprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 12 -- -vsprintf() expects argument #1 ($format) to be of type string, array given +vsprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 13 -- -vsprintf() expects argument #1 ($format) to be of type string, array given +vsprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 14 -- -vsprintf() expects argument #1 ($format) to be of type string, array given +vsprintf(): Argument #1 ($format) must be of type string, array given -- Iteration 15 -- string(0) "" @@ -180,5 +180,5 @@ string(0) "" string(0) "" -- Iteration 26 -- -vsprintf() expects argument #1 ($format) to be of type string, resource given +vsprintf(): Argument #1 ($format) must be of type string, resource given Done diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt index ad96101386..cd8c5c7e36 100644 --- a/tests/classes/abstract_user_call.phpt +++ b/tests/classes/abstract_user_call.phpt @@ -29,4 +29,4 @@ try { ?> --EXPECT-- test::func() -call_user_func() expects argument #1 ($function) to be a valid callback, cannot call abstract method test_base::func() +call_user_func(): Argument #1 ($function) must be a valid callback, cannot call abstract method test_base::func() diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index 7932fd4240..6903d9d8ba 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -13,7 +13,7 @@ function f(UndefClass $x) f(new stdClass); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: f() expects argument #1 ($x) to be of type UndefClass, stdClass given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: f(): Argument #1 ($x) must be of type UndefClass, stdClass given, called in %s on line %d and defined in %s:%d Stack trace: #0 %s(%d): f(Object(stdClass)) #1 {main} diff --git a/tests/classes/autoload_012.phpt b/tests/classes/autoload_012.phpt index 7ed944dc48..7a168b3275 100644 --- a/tests/classes/autoload_012.phpt +++ b/tests/classes/autoload_012.phpt @@ -14,4 +14,4 @@ try { ?> --EXPECT-- In autoload: string(6) "UndefC" -call_user_func() expects argument #1 ($function) to be a valid callback, class 'UndefC' not found +call_user_func(): Argument #1 ($function) must be a valid callback, class 'UndefC' not found diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt index a56efde2d9..74d14c8a40 100644 --- a/tests/classes/bug27504.phpt +++ b/tests/classes/bug27504.phpt @@ -27,5 +27,5 @@ try { ?> --EXPECT-- Called function foo:bar(1) -call_user_func_array() expects argument #1 ($function) to be a valid callback, cannot access private method foo::bar() +call_user_func_array(): Argument #1 ($function) must be a valid callback, cannot access private method foo::bar() Call to private method foo::bar() from context '' diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index 02968a9b3b..987298baa5 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -53,7 +53,7 @@ try { --EXPECT-- Object with no __toString(): Try 1: -printf() expects argument #1 ($format) to be of type string, object given +printf(): Argument #1 ($format) must be of type string, object given Try 2: diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt index ca476187f3..f1c1973cf3 100644 --- a/tests/classes/type_hinting_001.phpt +++ b/tests/classes/type_hinting_001.phpt @@ -32,7 +32,7 @@ $a->b($b); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: FooBar::a() expects argument #1 ($foo) to be of type Foo, Blort given, called in %s on line 27 and defined in %s:12 +Fatal error: Uncaught TypeError: FooBar::a(): Argument #1 ($foo) must be of type Foo, Blort given, called in %s on line 27 and defined in %s:12 Stack trace: #0 %s(%d): FooBar->a(Object(Blort)) #1 {main} diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt index a491a26a62..765de66bab 100644 --- a/tests/classes/type_hinting_002.phpt +++ b/tests/classes/type_hinting_002.phpt @@ -11,7 +11,7 @@ $o = new Foo; $o->a($o); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Foo::a() expects argument #1 ($foo) to be of type NonExisting, Foo given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: Foo::a(): Argument #1 ($foo) must be of type NonExisting, Foo given, called in %s on line %d and defined in %s:%d Stack trace: #0 %s(%d): Foo->a(Object(Foo)) #1 {main} diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt index c43f13dbef..fab088daae 100644 --- a/tests/classes/type_hinting_003.phpt +++ b/tests/classes/type_hinting_003.phpt @@ -57,7 +57,7 @@ array(1) { int(25) } -Fatal error: Uncaught TypeError: Test::f1() expects argument #1 ($ar) to be of type array, int given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: Test::f1(): Argument #1 ($ar) must be of type array, int given, called in %s on line %d and defined in %s:%d Stack trace: #0 %s(%d): Test::f1(1) #1 {main} diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt index 299ec1dd46..2ba8870b0a 100644 --- a/tests/classes/type_hinting_004.phpt +++ b/tests/classes/type_hinting_004.phpt @@ -144,10 +144,10 @@ Ensure type hints are enforced for functions invoked as callbacks. ?> --EXPECTF-- ---> Type hints with callback function: -0: f1() expects argument #1 ($a) to be of type A, int given%s(%d) +0: f1(): Argument #1 ($a) must be of type A, int given%s(%d) in f1; -0: f2() expects argument #1 ($a) to be of type ?A, int given%s(%d) +0: f2(): Argument #1 ($a) must be of type ?A, int given%s(%d) in f2; in f2; @@ -155,10 +155,10 @@ in f2; ---> Type hints with callback static method: -0: C::f1() expects argument #1 ($a) to be of type A, int given%s(%d) +0: C::f1(): Argument #1 ($a) must be of type A, int given%s(%d) in C::f1 (static); -0: C::f2() expects argument #1 ($a) to be of type ?A, int given%s(%d) +0: C::f2(): Argument #1 ($a) must be of type ?A, int given%s(%d) in C::f2 (static); in C::f2 (static); @@ -166,10 +166,10 @@ in C::f2 (static); ---> Type hints with callback instance method: -0: D::f1() expects argument #1 ($a) to be of type A, int given%s(%d) +0: D::f1(): Argument #1 ($a) must be of type A, int given%s(%d) in C::f1 (instance); -0: D::f2() expects argument #1 ($a) to be of type ?A, int given%s(%d) +0: D::f2(): Argument #1 ($a) must be of type ?A, int given%s(%d) in C::f2 (instance); in C::f2 (instance); diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt index 5f35b3a229..6b2804cfd4 100644 --- a/tests/lang/bug24658.phpt +++ b/tests/lang/bug24658.phpt @@ -53,7 +53,7 @@ int(2) object(foo)#%d (0) { } -Fatal error: Uncaught TypeError: typehint() expects argument #1 ($a) to be of type foo, int given in %s:%d +Fatal error: Uncaught TypeError: typehint(): Argument #1 ($a) must be of type foo, int given in %s:%d Stack trace: #0 [internal function]: typehint(1, 1) #1 %s(%d): array_walk(Array, 'typehint') diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt index 4d785592d8..a7481b6ea6 100644 --- a/tests/lang/catchable_error_001.phpt +++ b/tests/lang/catchable_error_001.phpt @@ -19,7 +19,7 @@ Catchable fatal error [1] echo "ALIVE!\n"; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: blah() expects argument #1 ($a) to be of type Foo, stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php:5 +Fatal error: Uncaught TypeError: blah(): Argument #1 ($a) must be of type Foo, stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php:5 Stack trace: #0 %s(%d): blah(Object(stdClass)) #1 {main} diff --git a/tests/lang/catchable_error_002.phpt b/tests/lang/catchable_error_002.phpt index 70e054c698..50f06051e3 100644 --- a/tests/lang/catchable_error_002.phpt +++ b/tests/lang/catchable_error_002.phpt @@ -25,5 +25,5 @@ Catchable fatal error [2] echo "ALIVE!\n"; ?> --EXPECTF-- -blah() expects argument #1 ($a) to be of type Foo, stdClass given, called in %scatchable_error_002.php on line %d +blah(): Argument #1 ($a) must be of type Foo, stdClass given, called in %scatchable_error_002.php on line %d ALIVE! diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt index eb17ff5b8d..293b469cd2 100644 --- a/tests/lang/type_hints_001.phpt +++ b/tests/lang/type_hints_001.phpt @@ -20,7 +20,7 @@ type_hint_foo($bar); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: type_hint_foo() expects argument #1 ($a) to be of type Foo, Bar given, called in %s on line 16 and defined in %s:9 +Fatal error: Uncaught TypeError: type_hint_foo(): Argument #1 ($a) must be of type Foo, Bar given, called in %s on line 16 and defined in %s:9 Stack trace: #0 %s(%d): type_hint_foo(Object(Bar)) #1 {main} diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt index 9041461150..72b80891cd 100644 --- a/tests/output/sapi_windows_vt100_support_winko_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt index 8e4509370e..45d288f15b 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt index 4ee1fd0cd6..6e42372cb8 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt index f330e124c2..f3e0502460 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt index 82694ad586..bd95ea7cb7 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt index a46f1767f3..a937bb9ac8 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt index eca06f2819..2cc9b94fa9 100644 --- a/tests/output/sapi_windows_vt100_support_winok_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt index 366de4b0fe..0f1a9f4625 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt index 9166cc47d0..0355dc4091 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt index 526c0dd098..e751877027 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt index 826aedb114..ce273f1780 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt index b7b4ff34be..0ca0cde849 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt @@ -78,19 +78,19 @@ STDERR (php://fd/2): - current value : bool(false) Not a stream: - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - enabling VT100 : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - disabling VT100: -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) - current value : -Warning: sapi_windows_vt100_support() expects argument #1 to be of type resource, string given in %s on line %d +Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d bool(false) Invalid stream (php://temp): - current value : |