felipe Tue Aug 19 02:51:28 2008 UTC Modified files: /php-src/ext/standard type.c var.c /php-src/ext/standard/tests/class_object get_class_variation_001.phpt get_object_vars_variation_003.phpt is_a_variation_002.phpt is_subclass_of_variation_002.phpt method_exists_variation_002.phpt /php-src/ext/standard/tests/file fread_error.phpt fscanf.phpt /php-src/ext/standard/tests/general_functions debug_zval_dump_e.phpt floatval.phpt gettype_settype_error.phpt intval.phpt is_numeric.phpt is_scalar.phpt is_string.phpt strval.phpt var_dump.phpt /php-src/ext/standard/tests/strings join_error.phpt Log: - MFB: New parameter parsing API - Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.56&r2=1.57&diff_format=u Index: php-src/ext/standard/type.c diff -u php-src/ext/standard/type.c:1.56 php-src/ext/standard/type.c:1.57 --- php-src/ext/standard/type.c:1.56 Sat Aug 2 04:40:45 2008 +++ php-src/ext/standard/type.c Tue Aug 19 02:51:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: type.c,v 1.56 2008/08/02 04:40:45 felipe Exp $ */ +/* $Id: type.c,v 1.57 2008/08/19 02:51:27 felipe Exp $ */ #include "php.h" #include "php_incomplete_class.h" @@ -27,8 +27,8 @@ { zval **arg; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &arg) == FAILURE) { + return; } switch (Z_TYPE_PP(arg)) { @@ -94,16 +94,14 @@ Set the type of the variable */ PHP_FUNCTION(settype) { - zval **var, **type; + zval **var; char *new_type; + int new_type_len; - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &var, &type) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zs", &var, &new_type, &new_type_len) == FAILURE) { + return; } - convert_to_string_ex(type); - new_type = Z_STRVAL_PP(type); - if (!strcasecmp(new_type, "integer")) { convert_to_long(*var); } else if (!strcasecmp(new_type, "int")) { @@ -147,27 +145,16 @@ Get the integer value of a variable using the optional base for the conversion */ PHP_FUNCTION(intval) { - zval **num, **arg_base; - int base; - - switch (ZEND_NUM_ARGS()) { - case 1: - if (zend_get_parameters_ex(1, &num) == FAILURE) { - WRONG_PARAM_COUNT; - } - base = 10; - break; - - case 2: - if (zend_get_parameters_ex(2, &num, &arg_base) == FAILURE) { - WRONG_PARAM_COUNT; - } - convert_to_long_ex(arg_base); - base = Z_LVAL_PP(arg_base); - break; + zval **num; + long arg_base = 0; + int base = 10; - default: - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|l", &num, &arg_base) == FAILURE) { + return; + } + + if (ZEND_NUM_ARGS() == 2) { + base = arg_base; } RETVAL_ZVAL(*num, 1, 0); @@ -181,8 +168,8 @@ { zval **num; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &num) == FAILURE) { + return; } RETVAL_ZVAL(*num, 1, 0); @@ -198,8 +185,8 @@ zval expr_copy; int use_copy; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &num) == FAILURE) { + return; } if (UG(unicode)) { @@ -329,14 +316,13 @@ Returns true if variable is a Unicode or binary string */ PHP_FUNCTION(is_string) { - zval **arg; + zval *arg; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected"); - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) { + return; } - if (Z_TYPE_PP(arg) == IS_UNICODE || Z_TYPE_PP(arg) == IS_STRING) { + if (Z_TYPE_P(arg) == IS_UNICODE || Z_TYPE_P(arg) == IS_STRING) { RETURN_TRUE; } else { RETURN_FALSE; @@ -356,14 +342,13 @@ Returns true if variable is a native, unicode or binary string */ PHP_FUNCTION(is_buffer) { - zval **arg; + zval *arg; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected"); - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) { + return; } - if (Z_TYPE_PP(arg) == IS_STRING || Z_TYPE_PP(arg) == IS_UNICODE) { + if (Z_TYPE_P(arg) == IS_STRING || Z_TYPE_P(arg) == IS_UNICODE) { RETURN_TRUE; } RETURN_FALSE; @@ -393,8 +378,8 @@ zval **arg; int result; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &arg) == FAILURE) { + return; } switch (Z_TYPE_PP(arg)) { @@ -433,9 +418,9 @@ PHP_FUNCTION(is_scalar) { zval **arg; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &arg) == FAILURE) { + return; } switch (Z_TYPE_PP(arg)) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.276&r2=1.277&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.276 php-src/ext/standard/var.c:1.277 --- php-src/ext/standard/var.c:1.276 Sun Aug 3 12:03:02 2008 +++ php-src/ext/standard/var.c Tue Aug 19 02:51:27 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.276 2008/08/03 12:03:02 jani Exp $ */ +/* $Id: var.c,v 1.277 2008/08/19 02:51:27 felipe Exp $ */ /* {{{ includes */ @@ -247,16 +247,12 @@ Dumps a string representation of variable to output */ PHP_FUNCTION(var_dump) { - zval ***args; + zval ***args = NULL; int argc; int i; - argc = ZEND_NUM_ARGS(); - - args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); - if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree(args); - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { + return; } for (i = 0; i < argc; i++) { @@ -270,16 +266,12 @@ Dumps a string representation of variable to output (verbose form) */ PHP_FUNCTION(var_inspect) { - zval ***args; + zval ***args = NULL; int argc; int i; - - argc = ZEND_NUM_ARGS(); - - args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); - if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree(args); - WRONG_PARAM_COUNT; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { + return; } for (i = 0; i < argc; i++) { @@ -443,16 +435,12 @@ Dumps a string representation of an internal zend value to output. */ PHP_FUNCTION(debug_zval_dump) { - zval ***args; + zval ***args = NULL; int argc; int i; - argc = ZEND_NUM_ARGS(); - - args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); - if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree(args); - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { + return; } for (i = 0; i < argc; i++) { @@ -1139,8 +1127,8 @@ php_serialize_data_t var_hash; smart_str buf = {0}; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &struc) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &struc) == FAILURE) { + return; } Z_TYPE_P(return_value) = IS_STRING; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_variation_001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/class_object/get_class_variation_001.phpt diff -u php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.3 php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.4 --- php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.3 Mon May 26 23:45:15 2008 +++ php-src/ext/standard/tests/class_object/get_class_variation_001.phpt Tue Aug 19 02:51:28 2008 @@ -76,95 +76,147 @@ --EXPECTF-- *** Testing get_class() : usage variations *** -Notice: Undefined variable: undefined_var in %s on line 58 +Notice: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line 61 +Notice: Undefined variable: unset_var in %s on line %d 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) -Notice: Array to string conversion in %s on line 67 +Warning: get_class() expects parameter 1 to be object, double given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value: Array (type: array) -bool(false) -Notice: Array to string conversion in %s on line 67 +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value: Array (type: array) -bool(false) -Notice: Array to string conversion in %s on line 67 +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value: Array (type: array) -bool(false) -Notice: Array to string conversion in %s on line 67 +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value: Array (type: array) -bool(false) -Notice: Array to string conversion in %s on line 67 +Warning: get_class() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d 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: unicode) -bool(false) + +Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL Arg value: (type: unicode) -bool(false) + +Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL Arg value: string (type: unicode) -bool(false) + +Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL Arg value: string (type: unicode) -bool(false) + +Warning: get_class() expects parameter 1 to be object, Unicode 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt diff -u php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt:1.3 php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt:1.4 --- php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt:1.3 Mon May 26 23:45:15 2008 +++ php-src/ext/standard/tests/class_object/get_object_vars_variation_003.phpt Tue Aug 19 02:51:28 2008 @@ -74,95 +74,147 @@ --EXPECTF-- *** Testing get_object_vars() : usage variations *** -Notice: Undefined variable: undefined_var in %s on line 56 +Notice: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line 59 +Notice: Undefined variable: unset_var in %s on line %d 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) -Notice: Array to string conversion in %s on line 65 +Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value Array -bool(false) -Notice: Array to string conversion in %s on line 65 +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value Array -bool(false) -Notice: Array to string conversion in %s on line 65 +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value Array -bool(false) -Notice: Array to string conversion in %s on line 65 +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d Arg value Array -bool(false) -Notice: Array to string conversion in %s on line 65 +Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d +NULL + +Notice: Array to string conversion in %s on line %d 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, Unicode string given in %s on line %d +NULL Arg value -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL Arg value string -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL Arg value string -bool(false) + +Warning: get_object_vars() expects parameter 1 to be object, Unicode 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/is_a_variation_002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/class_object/is_a_variation_002.phpt diff -u php-src/ext/standard/tests/class_object/is_a_variation_002.phpt:1.4 php-src/ext/standard/tests/class_object/is_a_variation_002.phpt:1.5 --- php-src/ext/standard/tests/class_object/is_a_variation_002.phpt:1.4 Thu Jun 26 11:07:14 2008 +++ php-src/ext/standard/tests/class_object/is_a_variation_002.phpt Tue Aug 19 02:51:28 2008 @@ -84,9 +84,9 @@ --EXPECTF-- *** Testing is_a() : usage variations *** -Notice: Undefined variable: undefined_var in %s on line 64 +Notice: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line 67 +Notice: Undefined variable: unset_var in %s on line %d Arg value 0 bool(false) @@ -115,40 +115,40 @@ Arg value 0.5 bool(false) -Notice: Array to string conversion in %s on line 73 +Notice: Array to string conversion in %s on line %d Arg value Array -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL -Notice: Array to string conversion in %s on line 73 +Notice: Array to string conversion in %s on line %d Arg value Array -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL -Notice: Array to string conversion in %s on line 73 +Notice: Array to string conversion in %s on line %d Arg value Array -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL -Notice: Array to string conversion in %s on line 73 +Notice: Array to string conversion in %s on line %d Arg value Array -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL -Notice: Array to string conversion in %s on line 73 +Notice: Array to string conversion in %s on line %d Arg value Array -Notice: Array to string conversion in %s on line 74 -bool(false) +Warning: is_a() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL Arg value bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt diff -u php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt:1.3 php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt:1.4 --- php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt:1.3 Mon May 26 23:45:15 2008 +++ php-src/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt Tue Aug 19 02:51:28 2008 @@ -84,8 +84,8 @@ ?> --EXPECTF-- *** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) +Error: 8 - Undefined variable: undefined_var, %s(%d) +Error: 8 - Undefined variable: unset_var, %s(%d) Arg value 0 bool(false) @@ -113,31 +113,31 @@ Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - is_subclass_of() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - is_subclass_of() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - is_subclass_of() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - is_subclass_of() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - is_subclass_of() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL Arg value bool(false) @@ -162,12 +162,11 @@ 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 Unicode 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 (Unicode or binary), object given, %s(%d) +NULL Arg value bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt diff -u php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt:1.3 php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt:1.4 --- php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt:1.3 Mon May 26 23:45:15 2008 +++ php-src/ext/standard/tests/class_object/method_exists_variation_002.phpt Tue Aug 19 02:51:28 2008 @@ -84,8 +84,8 @@ ?> --EXPECTF-- *** Testing method_exists() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) +Error: 8 - Undefined variable: undefined_var, %s(%d) +Error: 8 - Undefined variable: unset_var, %s(%d) Arg value 0 bool(false) @@ -113,31 +113,31 @@ Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - method_exists() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - method_exists() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - method_exists() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) +Error: 2 - method_exists() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL +Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) +Error: 2 - method_exists() expects parameter 2 to be string (Unicode or binary), array given, %s(%d) +NULL Arg value bool(false) @@ -162,12 +162,11 @@ 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 Unicode 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 (Unicode or binary), object given, %s(%d) +NULL Arg value bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/fread_error.phpt diff -u php-src/ext/standard/tests/file/fread_error.phpt:1.3 php-src/ext/standard/tests/file/fread_error.phpt:1.4 --- php-src/ext/standard/tests/file/fread_error.phpt:1.3 Tue May 27 09:34:53 2008 +++ php-src/ext/standard/tests/file/fread_error.phpt Tue Aug 19 02:51:28 2008 @@ -109,6 +109,6 @@ Warning: fread() expects parameter 1 to be resource, null given in %s on line %d NULL -Warning: fclose(): supplied argument is not a valid stream resource in %s on line %d -bool(false) +Warning: fclose() expects parameter 1 to be resource, null given in %s on line %d +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fscanf.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/fscanf.phpt diff -u php-src/ext/standard/tests/file/fscanf.phpt:1.3 php-src/ext/standard/tests/file/fscanf.phpt:1.4 --- php-src/ext/standard/tests/file/fscanf.phpt:1.3 Tue May 27 09:34:53 2008 +++ php-src/ext/standard/tests/file/fscanf.phpt Tue Aug 19 02:51:28 2008 @@ -61,14 +61,14 @@ --CLEAN-- <?php unlink(dirname(__FILE__)."/fscanf.dat"); ?> --EXPECTF-- -Warning: Wrong parameter count for fscanf() in %s on line %d +Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for fscanf() in %s on line %d +Warning: fscanf() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: fscanf(): supplied argument is not a valid File-Handle resource in %s on line %d -bool(false) +Warning: fscanf() expects parameter 1 to be resource, array given in %s on line %d +NULL int(0) NULL int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.2 php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.3 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.2 Sat May 12 12:18:13 2007 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt Tue Aug 19 02:51:28 2008 @@ -19,5 +19,5 @@ --EXPECTF-- *** Testing error conditions *** -Warning: Wrong parameter count for debug_zval_dump() in %s on line %d +Warning: debug_zval_dump() expects at least 1 parameter, 0 given in %s on line %d Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/floatval.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/general_functions/floatval.phpt diff -u php-src/ext/standard/tests/general_functions/floatval.phpt:1.4 php-src/ext/standard/tests/general_functions/floatval.phpt:1.5 --- php-src/ext/standard/tests/general_functions/floatval.phpt:1.4 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/floatval.phpt Tue Aug 19 02:51:28 2008 @@ -192,16 +192,16 @@ *** Testing error conditions *** -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.3 php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.4 --- php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.3 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt Tue Aug 19 02:51:28 2008 @@ -37,18 +37,18 @@ *** Testing gettype(): error conditions *** -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Testing settype(): error conditions *** -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 3 given in %s on line %d NULL Warning: settype(): Invalid type in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/general_functions/intval.phpt diff -u php-src/ext/standard/tests/general_functions/intval.phpt:1.4 php-src/ext/standard/tests/general_functions/intval.phpt:1.5 --- php-src/ext/standard/tests/general_functions/intval.phpt:1.4 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/intval.phpt Tue Aug 19 02:51:28 2008 @@ -297,10 +297,10 @@ *** Testing error conditions *** -Warning: Wrong parameter count for intval() in %s on line %d +Warning: intval() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for intval() in %s on line %d +Warning: intval() expects at most 2 parameters, 3 given in %s on line %d NULL --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_numeric.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_numeric.phpt diff -u php-src/ext/standard/tests/general_functions/is_numeric.phpt:1.2 php-src/ext/standard/tests/general_functions/is_numeric.phpt:1.3 --- php-src/ext/standard/tests/general_functions/is_numeric.phpt:1.2 Sat May 12 12:18:13 2007 +++ php-src/ext/standard/tests/general_functions/is_numeric.phpt Tue Aug 19 02:51:28 2008 @@ -380,9 +380,9 @@ *** Testing error conditions *** -Warning: Wrong parameter count for is_numeric() in %s on line %d +Warning: is_numeric() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for is_numeric() in %s on line %d +Warning: is_numeric() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_scalar.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_scalar.phpt diff -u php-src/ext/standard/tests/general_functions/is_scalar.phpt:1.2 php-src/ext/standard/tests/general_functions/is_scalar.phpt:1.3 --- php-src/ext/standard/tests/general_functions/is_scalar.phpt:1.2 Sat May 12 12:18:13 2007 +++ php-src/ext/standard/tests/general_functions/is_scalar.phpt Tue Aug 19 02:51:28 2008 @@ -230,12 +230,12 @@ *** Testing error conditions *** -Warning: Wrong parameter count for is_scalar() in %s on line %d +Warning: is_scalar() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for is_scalar() in %s on line %d +Warning: is_scalar() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: Wrong parameter count for is_scalar() in %s on line %d +Warning: is_scalar() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_string.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_string.phpt diff -u php-src/ext/standard/tests/general_functions/is_string.phpt:1.2 php-src/ext/standard/tests/general_functions/is_string.phpt:1.3 --- php-src/ext/standard/tests/general_functions/is_string.phpt:1.2 Sat May 12 12:18:13 2007 +++ php-src/ext/standard/tests/general_functions/is_string.phpt Tue Aug 19 02:51:28 2008 @@ -296,9 +296,9 @@ *** Testing error conditions *** -Warning: is_string(): Only one argument expected in %s on line %d -bool(false) +Warning: is_string() expects exactly 1 parameter, 0 given in %s on line %d +NULL -Warning: is_string(): Only one argument expected in %s on line %d -bool(false) +Warning: is_string() expects exactly 1 parameter, 2 given in %s on line %d +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/strval.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/general_functions/strval.phpt diff -u php-src/ext/standard/tests/general_functions/strval.phpt:1.5 php-src/ext/standard/tests/general_functions/strval.phpt:1.6 --- php-src/ext/standard/tests/general_functions/strval.phpt:1.5 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/strval.phpt Tue Aug 19 02:51:28 2008 @@ -310,9 +310,9 @@ *** Testing error conditions *** -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_dump.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/general_functions/var_dump.phpt diff -u php-src/ext/standard/tests/general_functions/var_dump.phpt:1.4 php-src/ext/standard/tests/general_functions/var_dump.phpt:1.5 --- php-src/ext/standard/tests/general_functions/var_dump.phpt:1.4 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/var_dump.phpt Tue Aug 19 02:51:28 2008 @@ -1907,5 +1907,5 @@ *** Testing error conditions *** -Warning: Wrong parameter count for var_dump() in %s on line %d +Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/join_error.phpt diff -u php-src/ext/standard/tests/strings/join_error.phpt:1.3 php-src/ext/standard/tests/strings/join_error.phpt:1.4 --- php-src/ext/standard/tests/strings/join_error.phpt:1.3 Tue May 27 10:50:45 2008 +++ php-src/ext/standard/tests/strings/join_error.phpt Tue Aug 19 02:51:28 2008 @@ -35,12 +35,12 @@ -- Testing join() function with Zero arguments -- -Warning: Wrong parameter count for join() in %s on line %d +Warning: join() expects at least 1 parameter, 0 given in %s on line %d NULL -- Testing join() function with more than expected no. of arguments -- -Warning: Wrong parameter count for join() in %s on line %d +Warning: join() expects at most 2 parameters, 3 given in %s on line %d NULL -- Testing join() with less than expected no. of arguments --
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php