From: Stanislav Malyshev Date: Wed, 18 Jun 2008 23:45:36 +0000 (+0000) Subject: fix tests for builtin Zend functions using new parsing API X-Git-Tag: php-5.3.0alpha1~721 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e562853ffea3220042b1c43add98ff74a7583f6;p=php fix tests for builtin Zend functions using new parsing API --- diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt index 1953a04397..19ee728fd2 100644 Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt index 02c8ef9c06..0834435610 100644 --- a/ext/standard/tests/array/each_error.phpt +++ b/ext/standard/tests/array/each_error.phpt @@ -32,11 +32,11 @@ echo "Done"; -- Testing each() function with Zero arguments -- -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 0 given in %s on line %d NULL -- Testing each() function with more than expected no. of arguments -- -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 2 given in %s on line %d NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index b563c31881..fb3bacb904 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -23,6 +23,6 @@ echo "Done"; -- Testing get_class() function with more than expected no. of arguments -- -Warning: Wrong parameter count for get_class() in %s on line 14 +Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14 NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index 6edb108032..e606ab6937 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -31,11 +31,11 @@ echo "Done"; -- Testing get_class_methods() function with Zero arguments -- -Warning: Wrong parameter count for get_class_methods() in %s on line 16 +Warning: get_class_methods() expects exactly 1 parameter, 0 given in %s on line 16 NULL -- Testing get_class_methods() function with more than expected no. of arguments -- -Warning: Wrong parameter count for get_class_methods() in %s on line 22 +Warning: get_class_methods() expects exactly 1 parameter, 2 given in %s on line 22 NULL Done \ No newline at end of file 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 6cbe0b3683..2e83b1dc5e 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -81,80 +81,132 @@ Notice: Undefined variable: undefined_var in %s on line 58 Notice: Undefined variable: unset_var in %s on line 61 Arg value: 0 (type: integer) -bool(false) + +Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value: 1 (type: integer) -bool(false) + +Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value: 12345 (type: integer) -bool(false) + +Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value: -2345 (type: integer) -bool(false) + +Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value: 10.5 (type: double) -bool(false) + +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value: -10.5 (type: double) -bool(false) + +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value: 101234567000 (type: double) -bool(false) + +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value: 1.07654321E-9 (type: double) -bool(false) + +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value: 0.5 (type: double) -bool(false) + +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value: Array (type: array) -bool(false) + +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value: Array (type: array) -bool(false) + +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value: Array (type: array) -bool(false) + +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value: Array (type: array) -bool(false) + +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value: Array (type: array) -bool(false) + +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value: (type: NULL) -bool(false) + +Warning: get_class() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value: (type: NULL) -bool(false) + +Warning: get_class() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value: 1 (type: boolean) -bool(false) + +Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value: (type: boolean) -bool(false) + +Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value: 1 (type: boolean) -bool(false) + +Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value: (type: boolean) -bool(false) + +Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value: (type: string) -bool(false) + +Warning: get_class() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value: (type: string) -bool(false) + +Warning: get_class() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value: string (type: string) -bool(false) + +Warning: get_class() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value: string (type: string) -bool(false) + +Warning: get_class() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value: (type: NULL) -bool(false) + +Warning: get_class() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value: (type: NULL) -bool(false) + +Warning: get_class() expects parameter 1 to be object, null given in %s on line %d +NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index 67a2705d05..2cb37f4a91 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -27,11 +27,11 @@ echo "Done"; -- Testing get_object_vars() function with Zero arguments -- -Warning: Wrong parameter count for get_object_vars() in %s on line 12 +Warning: get_object_vars() expects exactly 1 parameter, 0 given in %s on line 12 NULL -- Testing get_object_vars() function with more than expected no. of arguments -- -Warning: Wrong parameter count for get_object_vars() in %s on line 18 +Warning: get_object_vars() expects exactly 1 parameter, 2 given in %s on line 18 NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index 70794e7d57..adefa793ad 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -79,80 +79,132 @@ Notice: Undefined variable: undefined_var in %s on line 56 Notice: Undefined variable: unset_var in %s on line 59 Arg value 0 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value 1 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value 12345 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value -2345 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +NULL Arg value 10.5 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value -10.5 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value 101234567000 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value 1.07654321E-9 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value 0.5 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL Arg value Array -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value Array -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value Array -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value Array -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value Array -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value 1 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value 1 -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value string -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value string -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d +NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index cf9c3e8674..40c3dba279 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -24,6 +24,6 @@ echo "Done"; -- Testing get_parent_class() function with more than expected no. of arguments -- -Warning: Wrong parameter count for get_parent_class() in %s on line 15 +Warning: get_parent_class() expects at most 1 parameter, 2 given in %s on line 15 NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index d20016a495..f41c707b02 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -34,13 +34,13 @@ echo "Done"; Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 16 -Warning: Wrong parameter count for is_a() in %s on line 16 +Warning: is_a() expects exactly 2 parameters, 3 given in %s on line 16 NULL -- Testing is_a() function with less than expected no. of arguments -- Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 21 -Warning: Wrong parameter count for is_a() in %s on line 21 +Warning: is_a() expects exactly 2 parameters, 1 given in %s on line 21 NULL Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt index ed2c475de4..0ec87980e5 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -90,136 +90,136 @@ Notice: Undefined variable: unset_var in %s on line 67 Arg value 0 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 1 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 12345 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -2345 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 10.5 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -10.5 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 101234567000 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 1.07654321E-9 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 0.5 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value Array -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string, array given in %s on line %d +NULL Arg value Array -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string, array given in %s on line %d +NULL Arg value Array -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string, array given in %s on line %d +NULL Arg value Array -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string, array given in %s on line %d +NULL Arg value Array -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string, array given in %s on line %d +NULL Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 1 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value 1 -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value C Instance -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Arg value -Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74 +Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d bool(false) Done \ No newline at end of file diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt index 4403bde4c0..bc657866d0 100644 --- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt @@ -30,11 +30,11 @@ echo "Done"; -- Testing is_subclass_of() function with more than expected no. of arguments -- -Warning: Wrong parameter count for is_subclass_of() in %s on line 16 +Warning: is_subclass_of() expects exactly 2 parameters, 3 given in %s on line 16 NULL -- Testing is_subclass_of() function with less than expected no. of arguments -- -Warning: Wrong parameter count for is_subclass_of() in %s on line 21 +Warning: is_subclass_of() expects exactly 2 parameters, 1 given in %s on line 21 NULL Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt index a45583ce63..c550d8090c 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt @@ -115,24 +115,24 @@ Arg value 0.5 bool(false) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d) +NULL Arg value bool(false) @@ -157,12 +157,11 @@ bool(false) Arg value bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(76) +Error: 4096 - Object of class stdClass could not be converted to string, %s(%d) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(77) -Error: 8 - Object of class stdClass to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string, object given, %s(%d) +NULL Arg value bool(false) diff --git a/ext/standard/tests/class_object/method_exists_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt index 203128c677..929d84a76f 100644 --- a/ext/standard/tests/class_object/method_exists_error_001.phpt +++ b/ext/standard/tests/class_object/method_exists_error_001.phpt @@ -30,11 +30,11 @@ echo "Done"; -- Testing method_exists() function with more than expected no. of arguments -- -Warning: Wrong parameter count for method_exists() in %s on line 16 +Warning: method_exists() expects exactly 2 parameters, 3 given in %s on line 16 NULL -- Testing method_exists() function with less than expected no. of arguments -- -Warning: Wrong parameter count for method_exists() in %s on line 21 +Warning: method_exists() expects exactly 2 parameters, 1 given in %s on line 21 NULL Done diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt index 54d0ef94f5..ba38894b53 100644 --- a/ext/standard/tests/class_object/method_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt @@ -115,24 +115,24 @@ Arg value 0.5 bool(false) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77) +NULL Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77) +NULL Arg value bool(false) @@ -160,9 +160,8 @@ bool(false) Error: 4096 - Object of class stdClass could not be converted to string, %s(76) Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(77) -Error: 8 - Object of class stdClass to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string, object given, %s(77) +NULL Arg value bool(false) diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt index 17461a312b..4bce3ac7f7 100644 --- a/ext/standard/tests/general_functions/bug41970.phpt +++ b/ext/standard/tests/general_functions/bug41970.phpt @@ -16,12 +16,12 @@ echo "Done\n"; Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5 NULL -Notice: Array to string conversion in %sbug41970.php on line 6 -int(5) +Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 6 +NULL Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7 NULL -Notice: Array to string conversion in %sbug41970.php on line 8 -int(5) +Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 8 +NULL Done diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index ee97998649..33694f987b 100644 Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index b27da6c37d..0693880119 100644 Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 1a9e5a11fd..913de5c58b 100644 Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ diff --git a/ext/standard/tests/strings/strncasecmp_error.phpt b/ext/standard/tests/strings/strncasecmp_error.phpt index 7282ea9541..7b2d19e616 100644 --- a/ext/standard/tests/strings/strncasecmp_error.phpt +++ b/ext/standard/tests/strings/strncasecmp_error.phpt @@ -32,18 +32,18 @@ echo "*** Done ***\n"; *** Testing strncasecmp() function: error conditions *** -- Testing strncasecmp() function with Zero arguments -- -Warning: Wrong parameter count for strncasecmp() in %s on line %d +Warning: strncasecmp() expects exactly 3 parameters, 0 given in %s on line %d NULL -- Testing strncasecmp() function with less than expected number of arguments -- -Warning: Wrong parameter count for strncasecmp() in %s on line %d +Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for strncasecmp() in %s on line %d +Warning: strncasecmp() expects exactly 3 parameters, 2 given in %s on line %d NULL -- Testing strncasecmp() function with more than expected number of arguments -- -Warning: Wrong parameter count for strncasecmp() in %s on line %d +Warning: strncasecmp() expects exactly 3 parameters, 4 given in %s on line %d NULL -- Testing strncasecmp() function with invalid argument -- diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt index e06b2b26bf..adc9253964 100644 --- a/ext/standard/tests/strings/strncasecmp_variation10.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt @@ -129,34 +129,34 @@ int(-%d) int(-%d) -- Iteration 15 -- -Notice: Array to string conversion in %s on line 88 +Warning: strlen() expects parameter 1 to be string, array given in %s on line 88 -Notice: Array to string conversion in %s on line 89 -int(-%d) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89 +NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line 88 +Warning: strlen() expects parameter 1 to be string, array given in %s on line 88 -Notice: Array to string conversion in %s on line 89 -int(-%d) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89 +NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line 88 +Warning: strlen() expects parameter 1 to be string, array given in %s on line 88 -Notice: Array to string conversion in %s on line 89 -int(-%d) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89 +NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line 88 +Warning: strlen() expects parameter 1 to be string, array given in %s on line 88 -Notice: Array to string conversion in %s on line 89 -int(-%d) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89 +NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line 88 +Warning: strlen() expects parameter 1 to be string, array given in %s on line 88 -Notice: Array to string conversion in %s on line 89 -int(-%d) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89 +NULL -- Iteration 20 -- int(-%d) -- Iteration 21 -- @@ -178,7 +178,11 @@ int(-%d) -- Iteration 29 -- int(-%d) -- Iteration 30 -- -int(-%d) + +Warning: strlen() expects parameter 1 to be string, resource given in %s on line 88 + +Warning: strncasecmp() expects parameter 1 to be string, resource given in %s on line 89 +NULL -- Iteration 31 -- int(-%d) *** Done *** diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt index f756c6c006..03cc837077 100644 --- a/ext/standard/tests/strings/strncasecmp_variation11.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt @@ -130,34 +130,34 @@ int(%d) int(%d) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(%d) +Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d +NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(%d) +Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d +NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(%d) +Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d +NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(%d) +Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d +NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(%d) +Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d +NULL -- Iteration 20 -- int(%d) -- Iteration 21 -- @@ -179,7 +179,11 @@ int(%d) -- Iteration 29 -- int(%d) -- Iteration 30 -- -int(%d) + +Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d + +Warning: strncasecmp() expects parameter 2 to be string, resource given in %s on line %d +NULL -- Iteration 31 -- -int(%d) +int(4) *** Done *** diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index 3f73aa3518..9d46db9ee1 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -130,44 +130,34 @@ int(0) int(0) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 20 -- int(0) -- Iteration 21 -- @@ -189,7 +179,11 @@ int(0) -- Iteration 29 -- int(0) -- Iteration 30 -- -int(0) + +Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d + +Warning: strncasecmp() expects parameter 1 to be string, resource given in %s on line %d +NULL -- Iteration 31 -- int(0) *** Done *** diff --git a/ext/standard/tests/strings/strncasecmp_variation5.phpt b/ext/standard/tests/strings/strncasecmp_variation5.phpt index 4a9fa89a7c..c391ba3e92 100644 --- a/ext/standard/tests/strings/strncasecmp_variation5.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation5.phpt @@ -109,15 +109,25 @@ int(0) -- Iteration 7 -- int(0) -- Iteration 8 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d +NULL -- Iteration 9 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d +NULL -- Iteration 10 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d +NULL -- Iteration 11 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d +NULL -- Iteration 12 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d +NULL -- Iteration 13 -- int(0) -- Iteration 14 -- @@ -131,17 +141,23 @@ int(0) -- Iteration 18 -- int(0) -- Iteration 19 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, string given in %s on line %d +NULL -- Iteration 20 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, string given in %s on line %d +NULL -- Iteration 21 -- int(0) -- Iteration 22 -- int(0) -- Iteration 23 -- -int(0) + +Warning: strncasecmp() expects parameter 3 to be long, resource given in %s on line %d +NULL -- Iteration 24 -- -Notice: Object of class sample could not be converted to int in %s on line %d -int(0) +Warning: strncasecmp() expects parameter 3 to be long, object given in %s on line %d +NULL *** Done *** diff --git a/ext/standard/tests/strings/strncmp_error.phpt b/ext/standard/tests/strings/strncmp_error.phpt index 317a90406a..8e4d2805eb 100644 --- a/ext/standard/tests/strings/strncmp_error.phpt +++ b/ext/standard/tests/strings/strncmp_error.phpt @@ -28,16 +28,16 @@ echo "*** Done ***\n"; --EXPECTF-- *** Testing strncmp() function: error conditions *** -Warning: Wrong parameter count for strncmp() in %s on line %d +Warning: strncmp() expects exactly 3 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for strncmp() in %s on line %d +Warning: strncmp() expects exactly 3 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for strncmp() in %s on line %d +Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d NULL -Warning: Wrong parameter count for strncmp() in %s on line %d +Warning: strncmp() expects exactly 3 parameters, 4 given in %s on line %d NULL Warning: Length must be greater than or equal to 0 in %s on line %d diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 2af95e9b49..84684ea551 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -133,44 +133,34 @@ int(0) int(0) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d - -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string, array given in %s on line %d -Notice: Array to string conversion in %s on line %d -int(0) +Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d +NULL -- Iteration 20 -- int(0) -- Iteration 21 -- @@ -192,7 +182,11 @@ int(0) -- Iteration 29 -- int(0) -- Iteration 30 -- -int(0) + +Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d + +Warning: strncmp() expects parameter 1 to be string, resource given in %s on line %d +NULL -- Iteration 31 -- int(0) *** Done *** diff --git a/ext/standard/tests/strings/strncmp_variation5.phpt b/ext/standard/tests/strings/strncmp_variation5.phpt index cdb3afca19..73d7e8f319 100644 --- a/ext/standard/tests/strings/strncmp_variation5.phpt +++ b/ext/standard/tests/strings/strncmp_variation5.phpt @@ -123,15 +123,25 @@ int(0) -- Iteration 10 -- int(0) -- Iteration 11 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d +NULL -- Iteration 12 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d +NULL -- Iteration 13 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d +NULL -- Iteration 14 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d +NULL -- Iteration 15 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d +NULL -- Iteration 16 -- int(0) -- Iteration 17 -- @@ -145,17 +155,23 @@ int(0) -- Iteration 21 -- int(0) -- Iteration 22 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, string given in%s on line %d +NULL -- Iteration 23 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, string given in%s on line %d +NULL -- Iteration 24 -- int(0) -- Iteration 25 -- int(0) -- Iteration 26 -- -int(0) + +Warning: strncmp() expects parameter 3 to be long, resource given in%s on line %d +NULL -- Iteration 27 -- -Notice: Object of class sample could not be converted to int in %s on line %d -int(0) +Warning: strncmp() expects parameter 3 to be long, object given in%s on line %d +NULL *** Done ***