cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests ReflectionClass_getDefaultProperties_002.phpt
ReflectionClass_getDocComment_002.phpt ReflectionClass_getInterfaces_004.phpt ReflectionClass_getParentClass_001.phpt
ReflectionClass_modifiers_002.phpt ReflectionFunction_getClosure_error.phpt ReflectionMethod_006.phpt ReflectionMethod_getDocComment_error.phpt
ReflectionMethod_getModifiers_basic.phpt reflectionClass_FileInfo_error.phpt reflectionClass_getConstants_error.phpt
reflectionClass_getConstructor_error.phpt reflectionClass_getName_error.phpt reflectionClass_isInstantiable_error.phpt
reflectionClass_isInternal_error.phpt reflectionClass_isUserDefined_error.phpt reflectionObject_FileInfo_error.phpt
reflectionObject_getConstants_error.phpt reflectionObject_getConstructor_error.phpt reflectionObject_getName_error.phpt
reflectionObject_isInstantiable_error.phpt reflectionObject_isInternal_error.phpt reflectionObject_isUserDefined_error.phpt reflect!
ionProperty_error.phpt reflectionProperty_getDeclaringClass_variation1.phpt reflectionProperty_getDocComment_error.phpt
reflectionProperty_isDefault_basic.phpt

felipe Wed Jan 7 22:37:08 2009 UTC Modified files: /php-src/ext/reflection php_reflection.c /php-src/ext/reflection/tests ReflectionClass_getDefaultProperties_002.phpt ReflectionClass_getDocComment_002.phpt ReflectionClass_getInterfaces_004.phpt ReflectionClass_getParentClass_001.phpt ReflectionClass_modifiers_002.phpt ReflectionFunction_getClosure_error.phpt ReflectionMethod_006.phpt ReflectionMethod_getDocComment_error.phpt ReflectionMethod_getModifiers_basic.phpt reflectionClass_FileInfo_error.phpt reflectionClass_getConstants_error.phpt reflectionClass_getConstructor_error.phpt reflectionClass_getName_error.phpt reflectionClass_isInstantiable_error.phpt reflectionClass_isInternal_error.phpt reflectionClass_isUserDefined_error.phpt reflectionObject_FileInfo_error.phpt reflectionObject_getConstants_error.phpt reflectionObject_getConstructor_error.phpt reflectionObject_getName_error.phpt reflectionObject_isInstantiable_error.phpt reflectionObject_isInternal_error.phpt reflectionObject_isUserDefined_error.phpt reflectionProperty_error.phpt reflectionProperty_getDeclaringClass_variation1.phpt reflectionProperty_getDocComment_error.phpt reflectionProperty_isDefault_basic.phpt Log: - New parameter parsing - Removed METHOD_NOTSTATIC_NUMPARAMS

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.338&r2=1.339&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.338 php-src/ext/reflection/php_reflection.c:1.339 --- php-src/ext/reflection/php_reflection.c:1.338 Sat Jan 3 21:06:38 2009 +++ php-src/ext/reflection/php_reflection.c Wed Jan 7 22:37:07 2009 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.338 2009/01/03 21:06:38 helly Exp $ */ +/* $Id: php_reflection.c,v 1.339 2009/01/07 22:37:07 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -78,11 +78,6 @@ return; \ } \ -#define METHOD_NOTSTATIC_NUMPARAMS(ce, c) METHOD_NOTSTATIC(ce) \ - if (ZEND_NUM_ARGS() > c) { \ - ZEND_WRONG_PARAM_COUNT(); \ - } \ - /* Exception throwing macro */ #define _DO_THROW(msg) \ zend_throw_exception(reflection_exception_ptr, msg, 0 TSRMLS_CC); \ @@ -1143,7 +1138,9 @@ reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & mask); } @@ -1562,7 +1559,9 @@ string str; zval* name; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); _default_lookup_entry(getThis(), "name", sizeof("name"), &name TSRMLS_CC); string_init(&str); @@ -1575,7 +1574,9 @@ Returns this function's name */ ZEND_METHOD(reflection_function, getName) { - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -1587,7 +1588,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(intern->obj); } @@ -1601,7 +1604,9 @@ zend_function *fptr; zval* closure_this; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); if (intern->obj) { closure_this = zend_get_closure_this_ptr(intern->obj TSRMLS_CC); @@ -1619,7 +1624,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_INTERNAL_FUNCTION); } @@ -1632,7 +1639,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_USER_FUNCTION); } @@ -1658,7 +1667,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_RT_STRING(fptr->op_array.filename, 1); @@ -1674,7 +1685,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_start); @@ -1690,7 +1703,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_end); @@ -1706,7 +1721,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.doc_comment.v) { RETURN_ZSTRL(ZEND_STR_TYPE, fptr->op_array.doc_comment, fptr->op_array.doc_comment_len, 1); @@ -1723,7 +1740,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); /* Return an empty array in case no static variables exist */ @@ -1742,7 +1761,9 @@ reflection_object *intern; zend_function *fptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(fptr); zend_create_closure(return_value, fptr, NULL, NULL TSRMLS_CC); @@ -2162,7 +2183,9 @@ parameter_reference *param; string str; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); string_init(&str); _parameter_string(&str, param->fptr, param->arg_info, param->offset, param->required, "" TSRMLS_CC); @@ -2174,7 +2197,9 @@ Returns this parameters's name */ ZEND_METHOD(reflection_parameter, getName) { - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -2186,7 +2211,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); if (!param->fptr->common.scope) { @@ -2204,7 +2231,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->common.scope) { @@ -2221,7 +2250,9 @@ parameter_reference *param; zend_class_entry **pce, *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); if (param->arg_info->class_name.v) { @@ -2276,7 +2307,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->array_type_hint); @@ -2290,7 +2323,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->allow_null); @@ -2304,7 +2339,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->pass_by_reference); @@ -2318,7 +2355,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); RETVAL_LONG(param->offset); @@ -2332,7 +2371,9 @@ reflection_object *intern; parameter_reference *param; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->offset >= param->required); @@ -2347,7 +2388,9 @@ parameter_reference *param; zend_op *precv; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->type != ZEND_USER_FUNCTION) @@ -2373,7 +2416,9 @@ parameter_reference *param; zend_op *precv; - METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->type != ZEND_USER_FUNCTION) @@ -2584,7 +2629,9 @@ string str; zval* name; - METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(mptr); _default_lookup_entry(getThis(), "name", sizeof("name"), &name TSRMLS_CC); string_init(&str); @@ -2894,7 +2941,9 @@ zval **name; zstr colon; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -2920,7 +2969,9 @@ zval **name; zstr backslash; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -2946,7 +2997,9 @@ zval **name; zstr backslash; - METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -2972,7 +3025,9 @@ reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(mptr); /* we need to check if the ctor is the ctor of the class level we we * looking at since we might be looking at an inherited old style ctor @@ -2988,7 +3043,9 @@ reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & ZEND_ACC_DTOR); } @@ -3001,7 +3058,9 @@ reflection_object *intern; zend_function *mptr; - METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(mptr); RETURN_LONG(mptr->common.fn_flags); @@ -3125,7 +3184,9 @@ HashPosition pos; zval **value; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); zend_update_class_constants(ce TSRMLS_CC); @@ -3233,7 +3294,9 @@ int count, i; HashTable *ht_list[3]; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -3287,7 +3350,9 @@ zend_class_entry *ce; string str; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); string_init(&str); _class_string(&str, ce, intern->obj, "" TSRMLS_CC); @@ -3299,7 +3364,9 @@ Returns the class' name */ ZEND_METHOD(reflection_class, getName) { - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -3311,7 +3378,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_INTERNAL_CLASS); } @@ -3324,7 +3393,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_USER_CLASS); } @@ -3337,7 +3408,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_RT_STRING(ce->filename, 1); @@ -3353,7 +3426,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_FUNCTION) { RETURN_LONG(ce->line_start); @@ -3369,7 +3444,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_LONG(ce->line_end); @@ -3385,7 +3462,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS && ce->doc_comment.v) { RETURN_ZSTRL(ZEND_STR_TYPE, ce->doc_comment, ce->doc_comment_len, 1); @@ -3401,7 +3480,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->constructor) { @@ -3778,7 +3859,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); zend_hash_apply_with_argument(&ce->constants_table, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); @@ -3819,7 +3902,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); RETVAL_BOOL(ce->ce_flags & mask); } @@ -3832,7 +3917,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) { RETURN_FALSE; @@ -3879,7 +3966,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); RETURN_LONG(ce->ce_flags); @@ -4061,7 +4150,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); /* Return an empty array if this class implements no interfaces */ @@ -4088,7 +4179,9 @@ zend_class_entry *ce; zend_uint i; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); /* Return an empty array if this class implements no interfaces */ @@ -4107,7 +4200,9 @@ reflection_object *intern; zend_class_entry *ce; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ce); if (ce->parent) { @@ -4270,7 +4365,9 @@ zval **name; zstr colon; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -4296,7 +4393,9 @@ zval **name; zstr colon; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -4322,7 +4421,9 @@ zval **name; zstr colon; - METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"), (void **) &name) == FAILURE) { RETURN_FALSE; } @@ -4477,7 +4578,9 @@ property_reference *ref; string str; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); string_init(&str); _property_string(&str, &ref->prop, NULL_ZSTR, "" TSRMLS_CC); @@ -4489,7 +4592,9 @@ Returns the class' name */ ZEND_METHOD(reflection_property, getName) { - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -4499,7 +4604,9 @@ reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(ref->prop.flags & mask); } @@ -4555,7 +4662,9 @@ zval **zdef, *zv; zend_uchar utype = UG(unicode) ? IS_UNICODE : IS_STRING; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop.flags & ZEND_ACC_STATIC) { @@ -4582,7 +4691,9 @@ reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); RETURN_LONG(ref->prop.flags); @@ -4725,7 +4836,9 @@ zstr prop_name, class_name; int prop_name_len; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); if (zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, ref->prop.name, ref->prop.name_length, &class_name, &prop_name) != SUCCESS) { @@ -4754,7 +4867,9 @@ reflection_object *intern; property_reference *ref; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop.doc_comment.v) { RETURN_ZSTRL(ZEND_STR_TYPE, ref->prop.doc_comment, ref->prop.doc_comment_len, 1); @@ -4771,12 +4886,10 @@ property_reference *ref; zend_bool visible; - METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 1); - GET_REFLECTION_OBJECT_PTR(ref); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &visible) == FAILURE) { return; } + GET_REFLECTION_OBJECT_PTR(ref); ref->ignore_visibility = visible; } /* }}} */ @@ -4837,7 +4950,9 @@ zend_module_entry *module; string str; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); string_init(&str); _extension_string(&str, module, "" TSRMLS_CC); @@ -4849,7 +4964,9 @@ Returns this extension's name */ ZEND_METHOD(reflection_extension, getName) { - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } _default_get_entry(getThis(), "name", sizeof("name"), return_value TSRMLS_CC); } /* }}} */ @@ -4861,7 +4978,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); /* An extension does not necessarily have a version number */ @@ -4880,7 +4999,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -4930,7 +5051,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -4962,7 +5085,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -4997,7 +5122,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5012,7 +5139,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5028,7 +5157,9 @@ zend_module_entry *module; const zend_module_dep *dep; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5079,7 +5210,9 @@ reflection_object *intern; zend_module_entry *module; - METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0); + if (zend_parse_parameters_none() == FAILURE) { + return; + } GET_REFLECTION_OBJECT_PTR(module); php_info_print_module(module TSRMLS_CC); @@ -5560,7 +5693,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Revision: 1.338 $"); + php_info_print_table_row(2, "Version", "$Revision: 1.339 $"); php_info_print_table_end(); } /* }}} */ @@ -5574,7 +5707,7 @@ NULL, NULL, PHP_MINFO(reflection), - "$Revision: 1.338 $", + "$Revision: 1.339 $", STANDARD_MODULE_PROPERTIES }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt:1.2 php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt Wed Jan 7 22:37:07 2009 @@ -19,27 +19,26 @@ ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 5 +Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 6 +Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 7 +Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 8 +Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 9 +Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 10 +Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 11 +Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 12 -NULL \ No newline at end of file +Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt:1.2 php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt Wed Jan 7 22:37:07 2009 @@ -13,15 +13,14 @@ var_dump($rc->getDocComment(array(1,2,3))); ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 4 +Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 5 +Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 6 +Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 7 +Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt:1.2 php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt Wed Jan 7 22:37:07 2009 @@ -14,15 +14,14 @@ var_dump($rc->getInterfaces(array(1,2,3))); ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 5 +Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 6 +Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 7 +Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 8 +Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt:1.2 php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt Wed Jan 7 22:37:07 2009 @@ -28,11 +28,11 @@ Test bad params: -Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 11 +Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 12 +Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 13 -NULL \ No newline at end of file +Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 2 given in %s on line %d +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt:1.2 php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionClass_modifiers_002.phpt Wed Jan 7 22:37:07 2009 @@ -14,15 +14,14 @@ ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::isFinal() in %s on line 4 +Warning: ReflectionClass::isFinal() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isInterface() in %s on line 5 +Warning: ReflectionClass::isInterface() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isAbstract() in %s on line 6 +Warning: ReflectionClass::isAbstract() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getModifiers() in %s on line 7 +Warning: ReflectionClass::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt diff -u php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt:1.2 php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt:1.2 Fri Aug 8 12:42:40 2008 +++ php-src/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt Wed Jan 7 22:37:07 2009 @@ -23,5 +23,5 @@ --EXPECTF-- *** Testing ReflectionFunction::getClosure() : error conditions *** -Warning: Wrong parameter count for ReflectionFunction::getClosure() in %s on line %d +Warning: ReflectionFunction::getClosure() expects exactly 0 parameters, 1 given in %s on line %d ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionMethod_006.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/ReflectionMethod_006.phpt diff -u php-src/ext/reflection/tests/ReflectionMethod_006.phpt:1.2 php-src/ext/reflection/tests/ReflectionMethod_006.phpt:1.3 --- php-src/ext/reflection/tests/ReflectionMethod_006.phpt:1.2 Tue Nov 18 15:37:56 2008 +++ php-src/ext/reflection/tests/ReflectionMethod_006.phpt Wed Jan 7 22:37:07 2009 @@ -35,7 +35,7 @@ ?> --EXPECTF-- -Warning: ReflectionMethod::__construct() expects %s on line 3 +Warning: ReflectionMethod::__construct() expects exactly 1 parameter, 0 given in %s on line %d object(ReflectionMethod)#%d (2) { [u"name"]=> unicode(0) "" @@ -43,7 +43,7 @@ unicode(0) "" } -Warning: ReflectionMethod::__construct() expects %s on line 4 +Warning: ReflectionMethod::__construct() expects exactly 1 parameter, 3 given in %s on line %d object(ReflectionMethod)#%d (2) { [u"name"]=> unicode(0) "" @@ -51,50 +51,50 @@ unicode(0) "" } -Warning: Wrong parameter count for ReflectionMethod::isFinal() in %s on line 12 +Warning: ReflectionMethod::isFinal() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isAbstract() in %s on line 13 +Warning: ReflectionMethod::isAbstract() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isPrivate() in %s on line 14 +Warning: ReflectionMethod::isPrivate() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isProtected() in %s on line 15 +Warning: ReflectionMethod::isProtected() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isPublic() in %s on line 16 +Warning: ReflectionMethod::isPublic() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isStatic() in %s on line 17 +Warning: ReflectionMethod::isStatic() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isConstructor() in %s on line 18 +Warning: ReflectionMethod::isConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::isDestructor() in %s on line 19 +Warning: ReflectionMethod::isDestructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionMethod::getModifiers() in %s on line 20 +Warning: ReflectionMethod::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::isInternal() in %s on line 21 +Warning: ReflectionFunctionAbstract::isInternal() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::isUserDefined() in %s on line 22 +Warning: ReflectionFunctionAbstract::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getFileName() in %s on line 23 +Warning: ReflectionFunctionAbstract::getFileName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getStartLine() in %s on line 24 +Warning: ReflectionFunctionAbstract::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getEndLine() in %s on line 25 +Warning: ReflectionFunctionAbstract::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getStaticVariables() in %s on line 26 +Warning: ReflectionFunctionAbstract::getStaticVariables() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getName() in %s on line 27 -NULL \ No newline at end of file +Warning: ReflectionFunctionAbstract::getName() expects exactly 0 parameters, 1 given in %s on line %d +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt diff -u php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt:1.3 php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt:1.4 --- php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt:1.3 Sat May 24 13:35:03 2008 +++ php-src/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt Wed Jan 7 22:37:07 2009 @@ -8,10 +8,8 @@ var_dump($rc->getDocComment('X')); ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionFunctionAbstract::getDocComment() in %s on line %d +Warning: ReflectionFunctionAbstract::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionFunctionAbstract::getDocComment() in %s on line %d +Warning: ReflectionFunctionAbstract::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL - http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt diff -u php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.3 php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.4 --- php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.3 Sat May 24 13:35:03 2008 +++ php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt Wed Jan 7 22:37:08 2009 @@ -236,7 +236,7 @@ Wrong number of params: -Warning: Wrong parameter count for ReflectionMethod::getModifiers() in %s on line %d +Warning: ReflectionMethod::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d ReflectionMethod::getModifiers() modifiers: int(256) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt:1.2 php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt:1.3 --- php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt:1.2 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_FileInfo_error.phpt Wed Jan 7 22:37:08 2009 @@ -14,24 +14,24 @@ } ?> --EXPECTF-- -unicode(%d) "%s" +unicode(%s) "%s" -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 +Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10 +Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 2 given in %s on line %d NULL int(2) -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9 +Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10 +Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 2 given in %s on line %d NULL int(2) -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9 +Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10 +Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt:1.2 php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt:1.3 --- php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt:1.2 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_getConstants_error.phpt Wed Jan 7 22:37:08 2009 @@ -15,10 +15,10 @@ ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8 +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 9 +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 10 +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 11 +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 2 given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt:1.1 php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt:1.2 --- php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt:1.1 Tue Jul 10 16:21:26 2007 +++ php-src/ext/reflection/tests/reflectionClass_getConstructor_error.phpt Wed Jan 7 22:37:08 2009 @@ -10,15 +10,14 @@ var_dump($rc->getConstructor(array(1,2,3))); ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 4 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 5 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 6 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getName_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_getName_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_getName_error.phpt:1.3 php-src/ext/reflection/tests/reflectionClass_getName_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionClass_getName_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_getName_error.phpt Wed Jan 7 22:37:08 2009 @@ -9,9 +9,8 @@ var_dump($r1->getName('X', true)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 5 +Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 6 +Warning: ReflectionClass::getName() expects exactly 0 parameters, 2 given in %s on line %d NULL - http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt:1.3 php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt Wed Jan 7 22:37:08 2009 @@ -12,8 +12,8 @@ ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 7 +Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 8 +Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt:1.3 php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt Wed Jan 7 22:37:08 2009 @@ -7,8 +7,8 @@ var_dump($r1->isInternal('X', true)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 3 +Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4 +Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt:1.3 php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt Wed Jan 7 22:37:08 2009 @@ -7,8 +7,8 @@ var_dump($r1->isUserDefined('X', true)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 3 +Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4 +Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_FileInfo_error.phpt Wed Jan 7 22:37:08 2009 @@ -16,22 +16,22 @@ --EXPECTF-- unicode(%d) "%s" -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 +Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10 +Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 2 given in %s on line %d NULL int(2) -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9 +Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10 +Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 2 given in %s on line %d NULL int(2) -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9 +Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10 +Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_getConstants_error.phpt Wed Jan 7 22:37:08 2009 @@ -12,7 +12,6 @@ ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 7 - -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8 +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d +Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_getConstructor_error.phpt Wed Jan 7 22:37:08 2009 @@ -10,15 +10,14 @@ var_dump($rc->getConstructor(array(1,2,3))); ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 4 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 5 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 6 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7 +Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_getName_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_getName_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_getName_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_getName_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_getName_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_getName_error.phpt Wed Jan 7 22:37:08 2009 @@ -13,11 +13,11 @@ var_dump($r3->getName(0)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 8 +Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 9 +Warning: ReflectionClass::getName() expects exactly 0 parameters, 2 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 10 +Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt Wed Jan 7 22:37:08 2009 @@ -15,8 +15,8 @@ ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 10 +Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 11 +Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_isInternal_error.phpt Wed Jan 7 22:37:08 2009 @@ -8,8 +8,8 @@ var_dump($r1->isInternal('X', true)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4 +Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 5 +Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt:1.3 php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt:1.3 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt Wed Jan 7 22:37:08 2009 @@ -8,8 +8,8 @@ var_dump($r1->isUserDefined('X', true)); ?> --EXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4 +Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 5 +Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 2 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_error.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/reflection/tests/reflectionProperty_error.phpt diff -u php-src/ext/reflection/tests/reflectionProperty_error.phpt:1.4 php-src/ext/reflection/tests/reflectionProperty_error.phpt:1.5 --- php-src/ext/reflection/tests/reflectionProperty_error.phpt:1.4 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionProperty_error.phpt Wed Jan 7 22:37:08 2009 @@ -45,23 +45,23 @@ unicode(0) "" } -Warning: Wrong parameter count for ReflectionProperty::getName() in %s on line %d +Warning: ReflectionProperty::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::isPrivate() in %s on line %d +Warning: ReflectionProperty::isPrivate() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::isProtected() in %s on line %d +Warning: ReflectionProperty::isProtected() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::isPublic() in %s on line %d +Warning: ReflectionProperty::isPublic() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::isStatic() in %s on line %d +Warning: ReflectionProperty::isStatic() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::getModifiers() in %s on line %d +Warning: ReflectionProperty::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d +Warning: ReflectionProperty::isDefault() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt diff -u php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt:1.4 php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt:1.5 --- php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt:1.4 Tue May 27 13:16:27 2008 +++ php-src/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt Wed Jan 7 22:37:08 2009 @@ -24,4 +24,4 @@ } Wrong number of params: -Warning: Wrong parameter count for ReflectionProperty::getDeclaringClass() in %s on line %d +Warning: ReflectionProperty::getDeclaringClass() expects exactly 0 parameters, 1 given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt diff -u php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt:1.3 php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt:1.4 --- php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt:1.3 Sat May 24 13:35:03 2008 +++ php-src/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt Wed Jan 7 22:37:08 2009 @@ -15,15 +15,14 @@ ?> --EXPECTF-- - -Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d +Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d +Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d +Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL -Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d +Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt diff -u php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt:1.3 php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt:1.4 --- php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt:1.3 Sat May 24 13:35:03 2008 +++ php-src/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt Wed Jan 7 22:37:08 2009 @@ -60,4 +60,4 @@ ********************************** Wrong number of params: -Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d +Warning: ReflectionProperty::isDefault() expects exactly 0 parameters, 1 given in %s on line %d