MFH:

- New parameter parsing
- Removed METHOD_NOTSTATIC_NUMPARAMS

28 files changed, 313 insertions, 194 deletions

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 74b7cbfb27..859b9a93ed 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -83,11 +83,6 @@ ZEND_DECLARE_MODULE_GLOBALS(reflection)
 		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);                                       \
@@ -1114,7 +1109,9 @@ static void _function_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask)
 	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);
 }
@@ -1527,7 +1524,9 @@ ZEND_METHOD(reflection_function, __toString)
 	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);
@@ -1540,7 +1539,9 @@ ZEND_METHOD(reflection_function, __toString)
    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);
 }
 /* }}} */
@@ -1552,7 +1553,9 @@ ZEND_METHOD(reflection_function, isClosure)
 	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);
 }
@@ -1566,7 +1569,9 @@ ZEND_METHOD(reflection_function, getClosureThis)
 	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);
@@ -1584,7 +1589,9 @@ ZEND_METHOD(reflection_function, isInternal)
 	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);
 }
@@ -1597,7 +1604,9 @@ ZEND_METHOD(reflection_function, isUserDefined)
 	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);
 }
@@ -1623,7 +1632,9 @@ ZEND_METHOD(reflection_function, getFileName)
 	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_STRING(fptr->op_array.filename, 1);
@@ -1639,7 +1650,9 @@ ZEND_METHOD(reflection_function, getStartLine)
 	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);
@@ -1655,7 +1668,9 @@ ZEND_METHOD(reflection_function, getEndLine)
 	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);
@@ -1671,7 +1686,9 @@ ZEND_METHOD(reflection_function, getDocComment)
 	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) {
 		RETURN_STRINGL(fptr->op_array.doc_comment, fptr->op_array.doc_comment_len, 1);
@@ -1688,7 +1705,9 @@ ZEND_METHOD(reflection_function, getStaticVariables)
 	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 */
@@ -1707,7 +1726,9 @@ ZEND_METHOD(reflection_function, getClosure)
 	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);
@@ -2126,7 +2147,9 @@ ZEND_METHOD(reflection_parameter, __toString)
 	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);
@@ -2138,7 +2161,9 @@ ZEND_METHOD(reflection_parameter, __toString)
    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);
 }
 /* }}} */
@@ -2150,7 +2175,9 @@ ZEND_METHOD(reflection_parameter, getDeclaringFunction)
 	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) {
@@ -2168,7 +2195,9 @@ ZEND_METHOD(reflection_parameter, getDeclaringClass)
 	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) {
@@ -2185,7 +2214,9 @@ ZEND_METHOD(reflection_parameter, getClass)
 	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) {
@@ -2239,7 +2270,9 @@ ZEND_METHOD(reflection_parameter, isArray)
 	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);
@@ -2253,7 +2286,9 @@ ZEND_METHOD(reflection_parameter, allowsNull)
 	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);
@@ -2267,7 +2302,9 @@ ZEND_METHOD(reflection_parameter, isPassedByReference)
 	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);
@@ -2281,7 +2318,9 @@ ZEND_METHOD(reflection_parameter, getPosition)
 	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);
@@ -2295,7 +2334,9 @@ ZEND_METHOD(reflection_parameter, isOptional)
 	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);
@@ -2310,7 +2351,9 @@ ZEND_METHOD(reflection_parameter, isDefaultValueAvailable)
 	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)
@@ -2336,7 +2379,9 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
 	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)
@@ -2514,7 +2559,9 @@ ZEND_METHOD(reflection_method, __toString)
 	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);
@@ -2829,7 +2876,9 @@ ZEND_METHOD(reflection_function, inNamespace)
 	zval **name;
 	char *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;
 	}
@@ -2850,7 +2899,9 @@ ZEND_METHOD(reflection_function, getNamespaceName)
 	zval **name;
 	char *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;
 	}
@@ -2871,7 +2922,9 @@ ZEND_METHOD(reflection_function, getShortName)
 	zval **name;
 	char *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;
 	}
@@ -2892,7 +2945,9 @@ ZEND_METHOD(reflection_method, isConstructor)
 	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
@@ -2908,7 +2963,9 @@ ZEND_METHOD(reflection_method, isDestructor)
 	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);
 }
@@ -2921,7 +2978,9 @@ ZEND_METHOD(reflection_method, getModifiers)
 	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);
@@ -3040,7 +3099,9 @@ ZEND_METHOD(reflection_class, getStaticProperties)
 	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);
@@ -3145,7 +3206,9 @@ ZEND_METHOD(reflection_class, getDefaultProperties)
 	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);
 
@@ -3198,7 +3261,9 @@ ZEND_METHOD(reflection_class, __toString)
 	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);
@@ -3210,7 +3275,9 @@ ZEND_METHOD(reflection_class, __toString)
    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);
 }
 /* }}} */
@@ -3222,7 +3289,9 @@ ZEND_METHOD(reflection_class, isInternal)
 	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);
 }
@@ -3235,7 +3304,9 @@ ZEND_METHOD(reflection_class, isUserDefined)
 	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);
 }
@@ -3248,7 +3319,9 @@ ZEND_METHOD(reflection_class, getFileName)
 	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_STRING(ce->filename, 1);
@@ -3264,7 +3337,9 @@ ZEND_METHOD(reflection_class, getStartLine)
 	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);
@@ -3280,7 +3355,9 @@ ZEND_METHOD(reflection_class, getEndLine)
 	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);
@@ -3296,7 +3373,9 @@ ZEND_METHOD(reflection_class, getDocComment)
 	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) {
 		RETURN_STRINGL(ce->doc_comment, ce->doc_comment_len, 1);
@@ -3312,7 +3391,9 @@ ZEND_METHOD(reflection_class, getConstructor)
 	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) {
@@ -3657,7 +3738,9 @@ ZEND_METHOD(reflection_class, getConstants)
 	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);
@@ -3697,7 +3780,9 @@ static void _class_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask)
 	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);
 }
@@ -3710,7 +3795,9 @@ ZEND_METHOD(reflection_class, isInstantiable)
 	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;
@@ -3757,7 +3844,9 @@ ZEND_METHOD(reflection_class, getModifiers)
 	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);
@@ -3940,7 +4029,9 @@ ZEND_METHOD(reflection_class, getInterfaces)
 	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 */
@@ -3967,7 +4058,9 @@ ZEND_METHOD(reflection_class, getInterfaceNames)
 	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 */
@@ -3986,7 +4079,9 @@ ZEND_METHOD(reflection_class, getParentClass)
 	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) {
@@ -4147,7 +4242,9 @@ ZEND_METHOD(reflection_class, inNamespace)
 	zval **name;
 	char *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;
 	}
@@ -4168,7 +4265,9 @@ ZEND_METHOD(reflection_class, getNamespaceName)
 	zval **name;
 	char *backslash;
 
-	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;
 	}
@@ -4189,7 +4288,9 @@ ZEND_METHOD(reflection_class, getShortName)
 	zval **name;
 	char *backslash;
 
-	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;
 	}
@@ -4336,7 +4437,9 @@ ZEND_METHOD(reflection_property, __toString)
 	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, "" TSRMLS_CC);
@@ -4348,7 +4451,9 @@ ZEND_METHOD(reflection_property, __toString)
    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);
 }
 /* }}} */
@@ -4358,7 +4463,9 @@ static void _property_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask)
 	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);
 }
@@ -4410,7 +4517,9 @@ ZEND_METHOD(reflection_property, getModifiers)
 	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);
@@ -4547,7 +4656,9 @@ ZEND_METHOD(reflection_property, getDeclaringClass)
 	char *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_unmangle_property_name(ref->prop.name, ref->prop.name_length, &class_name, &prop_name) != SUCCESS) {
@@ -4576,7 +4687,9 @@ ZEND_METHOD(reflection_property, getDocComment)
 	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) {
 		RETURN_STRINGL(ref->prop.doc_comment, ref->prop.doc_comment_len, 1);
@@ -4593,12 +4706,10 @@ ZEND_METHOD(reflection_property, setAccessible)
 	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;
 }
 /* }}} */
@@ -4659,7 +4770,9 @@ ZEND_METHOD(reflection_extension, __toString)
 	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);
@@ -4671,7 +4784,9 @@ ZEND_METHOD(reflection_extension, __toString)
    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);
 }
 /* }}} */
@@ -4683,7 +4798,9 @@ ZEND_METHOD(reflection_extension, getVersion)
 	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 */
@@ -4702,7 +4819,9 @@ ZEND_METHOD(reflection_extension, getFunctions)
 	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);
@@ -4751,7 +4870,9 @@ ZEND_METHOD(reflection_extension, getConstants)
 	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);
@@ -4783,7 +4904,9 @@ ZEND_METHOD(reflection_extension, getINIEntries)
 	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);
@@ -4818,7 +4941,9 @@ ZEND_METHOD(reflection_extension, getClasses)
 	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);
@@ -4833,7 +4958,9 @@ ZEND_METHOD(reflection_extension, getClassNames)
 	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);
@@ -4849,7 +4976,9 @@ ZEND_METHOD(reflection_extension, getDependencies)
 	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);
@@ -4900,7 +5029,9 @@ ZEND_METHOD(reflection_extension, info)
 	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);
diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
index 6012f08551..7c178ac8ea 100644
--- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
@@ -19,27 +19,26 @@ var_dump($rc->getStaticProperties(array(1,2,3)));
 
 ?>
 --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
diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
index 6668a8b656..5bbd596488 100644
--- a/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
@@ -13,15 +13,14 @@ var_dump($rc->getDocComment(true));
 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
diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
index 5f42e4736d..f62d58cd72 100644
--- a/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
@@ -14,15 +14,14 @@ var_dump($rc->getInterfaces(true));
 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
diff --git a/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt b/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
index e26595a87b..be50dbb730 100644
--- a/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
@@ -28,11 +28,11 @@ bool(false)
 
 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
diff --git a/ext/reflection/tests/ReflectionClass_modifiers_002.phpt b/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
index 3fa247454f..a3a567ccbb 100644
--- a/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
@@ -14,15 +14,14 @@ var_dump($rc->getModifiers(array(1,2,3)));
 
 ?>
 --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
diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
index 76851ea5cc..9a963e41ca 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
@@ -23,5 +23,5 @@ $closure = $func->getClosure('bar');
 --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===
diff --git a/ext/reflection/tests/ReflectionMethod_006.phpt b/ext/reflection/tests/ReflectionMethod_006.phpt
index 4a8192b9ed..a5164190ca 100644
--- a/ext/reflection/tests/ReflectionMethod_006.phpt
+++ b/ext/reflection/tests/ReflectionMethod_006.phpt
@@ -35,7 +35,7 @@ var_dump($rm->getName(1));
 
 ?>
 --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) {
   ["name"]=>
   string(0) ""
@@ -43,7 +43,7 @@ object(ReflectionMethod)#%d (2) {
   string(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) {
   ["name"]=>
   string(0) ""
@@ -51,50 +51,50 @@ object(ReflectionMethod)#%d (2) {
   string(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
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
index b3e4d9e30f..02de25bab0 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
@@ -8,10 +8,8 @@ var_dump($rc->getDocComment(null));
 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
-
diff --git a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
index 3e6ddc6b2c..790444384d 100644
--- a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
@@ -236,7 +236,7 @@ int(65794)
 
 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)
diff --git a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
index 766cdf3b71..b42be136cd 100644
--- a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
+++ b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
@@ -16,22 +16,22 @@ foreach ($methods as $method) {
 --EXPECTF--
 string(%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
-NULL
\ No newline at end of file
+Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 2 given in %s on line %d
+NULL
diff --git a/ext/reflection/tests/reflectionClass_getConstants_error.phpt b/ext/reflection/tests/reflectionClass_getConstants_error.phpt
index 73c407d656..1784d712a4 100644
--- a/ext/reflection/tests/reflectionClass_getConstants_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getConstants_error.phpt
@@ -15,10 +15,10 @@ $rc->getConstants('A', 'B');
 
 ?>
 --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
diff --git a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt b/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
index 8892b1d6b0..7e8932a5ed 100644
--- a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
@@ -10,15 +10,14 @@ var_dump($rc->getConstructor(true));
 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
diff --git a/ext/reflection/tests/reflectionClass_getName_error.phpt b/ext/reflection/tests/reflectionClass_getName_error.phpt
index 6f5699c931..06cc4155be 100644
--- a/ext/reflection/tests/reflectionClass_getName_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getName_error.phpt
@@ -9,9 +9,8 @@ var_dump($r1->getName('X'));
 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
- 
diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
index cc31a2f42c..52be239121 100644
--- a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
@@ -12,8 +12,8 @@ var_dump($reflectionClass->IsInstantiable(0, null));
 
 ?>
 --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
diff --git a/ext/reflection/tests/reflectionClass_isInternal_error.phpt b/ext/reflection/tests/reflectionClass_isInternal_error.phpt
index b1117e8304..ef69a4c393 100644
--- a/ext/reflection/tests/reflectionClass_isInternal_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isInternal_error.phpt
@@ -7,8 +7,8 @@ var_dump($r1->isInternal('X'));
 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
diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
index 077e4d6a6d..ac88884179 100644
--- a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
@@ -7,8 +7,8 @@ var_dump($r1->isUserDefined('X'));
 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
diff --git a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
index f66d2fb59e..d30e677178 100644
--- a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
+++ b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
@@ -16,22 +16,22 @@ foreach ($methods as $method) {
 --EXPECTF--
 string(%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
diff --git a/ext/reflection/tests/reflectionObject_getConstants_error.phpt b/ext/reflection/tests/reflectionObject_getConstants_error.phpt
index 81ec9ed2ed..d3b90805eb 100644
--- a/ext/reflection/tests/reflectionObject_getConstants_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getConstants_error.phpt
@@ -12,7 +12,6 @@ $rc->getConstants(true);
 
 ?>
 --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
diff --git a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
index 5cabc2ed10..2f52de2ed8 100644
--- a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
@@ -10,15 +10,14 @@ var_dump($rc->getConstructor(true));
 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
diff --git a/ext/reflection/tests/reflectionObject_getName_error.phpt b/ext/reflection/tests/reflectionObject_getName_error.phpt
index eb64244c15..ff8e279e9b 100644
--- a/ext/reflection/tests/reflectionObject_getName_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getName_error.phpt
@@ -13,11 +13,11 @@ var_dump($r3->getName('x','y'));
 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
diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
index 8f418ac0e6..f993367b2d 100644
--- a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
@@ -15,8 +15,8 @@ var_dump($reflectionObject->IsInstantiable(0, null));
 
 ?>
 --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
diff --git a/ext/reflection/tests/reflectionObject_isInternal_error.phpt b/ext/reflection/tests/reflectionObject_isInternal_error.phpt
index c22d748072..996add6cd4 100644
--- a/ext/reflection/tests/reflectionObject_isInternal_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isInternal_error.phpt
@@ -8,8 +8,8 @@ var_dump($r1->isInternal('X'));
 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
diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
index 70533cf3d6..06be47ae67 100644
--- a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
@@ -8,8 +8,8 @@ var_dump($r1->isUserDefined('X'));
 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
diff --git a/ext/reflection/tests/reflectionProperty_error.phpt b/ext/reflection/tests/reflectionProperty_error.phpt
index 441d4d2b5e..56de6e1f2e 100644
--- a/ext/reflection/tests/reflectionProperty_error.phpt
+++ b/ext/reflection/tests/reflectionProperty_error.phpt
@@ -21,7 +21,6 @@ var_dump($rp->isDefault(1));
 
 ?>
 --EXPECTF--
-
 Warning: ReflectionProperty::__construct() expects exactly 2 parameters, 0 given in %s on line %d
 object(ReflectionProperty)#%d (2) {
   ["name"]=>
@@ -46,23 +45,23 @@ object(ReflectionProperty)#%d (2) {
   string(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
diff --git a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
index f4a3a0f543..bf525e1c4f 100644
--- a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
+++ b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
@@ -24,4 +24,4 @@ object(ReflectionClass)#%d (1) {
 }
 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
diff --git a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt b/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
index 12a62173c3..dae7be2fb9 100644
--- a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
+++ b/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
@@ -15,15 +15,14 @@ var_dump($rc->getDocComment(array(1, 2, 3)));
 
 ?>
 --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
diff --git a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
index 99f7c8bbc6..22ee117cc8 100644
--- a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
+++ b/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
@@ -60,4 +60,4 @@ bool(true)
 **********************************
 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