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