diff options
Diffstat (limited to 'ext/standard')
109 files changed, 427 insertions, 427 deletions
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 |