- Fix some arginfos (thanks Philip)

- Added arginfo info. for void params

3 files changed, 198 insertions, 110 deletions

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index b05c5215b6..a1ee0d6eb1 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2961,7 +2961,7 @@ ZEND_METHOD(reflection_method, getPrototype)
 }
 /* }}} */
 
-/* {{{ proto public void ReflectionMethod::setAccessible()
+/* {{{ proto public void ReflectionMethod::setAccessible(bool visible)
    Sets whether non-public methods can be invoked */
 ZEND_METHOD(reflection_method, setAccessible)
 {
@@ -4678,7 +4678,7 @@ ZEND_METHOD(reflection_property, getDocComment)
 }
 /* }}} */
 
-/* {{{ proto public int ReflectionProperty::setAccessible()
+/* {{{ proto public int ReflectionProperty::setAccessible(bool visible)
    Sets whether non-public properties can be requested */
 ZEND_METHOD(reflection_property, setAccessible)
 {
@@ -5028,6 +5028,9 @@ static const zend_function_entry reflection_exception_functions[] = {
 	{NULL, NULL, NULL}
 };
 
+ZEND_BEGIN_ARG_INFO(arginfo_reflection__void, 0)
+ZEND_END_ARG_INFO()
+
 
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_getModifierNames, 0)
 	ZEND_ARG_INFO(0, modifiers)
@@ -5046,7 +5049,7 @@ static const zend_function_entry reflection_functions[] = {
 
 static const zend_function_entry reflector_functions[] = {
 	ZEND_FENTRY(export, NULL, NULL, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-	ZEND_ABSTRACT_ME(reflector, __toString, NULL)
+	ZEND_ABSTRACT_ME(reflector, __toString, arginfo_reflection__void)
 	{NULL, NULL, NULL}
 };
 
@@ -5068,35 +5071,35 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invokeArgs, 0)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_function_abstract_functions[] = {
-	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
-	PHP_ABSTRACT_ME(reflection_function, __toString, NULL)
-	ZEND_ME(reflection_function, inNamespace, NULL, 0)
-	ZEND_ME(reflection_function, isClosure, NULL, 0)
-	ZEND_ME(reflection_function, isDeprecated, NULL, 0)
-	ZEND_ME(reflection_function, isInternal, NULL, 0)
-	ZEND_ME(reflection_function, isUserDefined, NULL, 0)
-	ZEND_ME(reflection_function, getDocComment, NULL, 0)
-	ZEND_ME(reflection_function, getEndLine, NULL, 0)
-	ZEND_ME(reflection_function, getExtension, NULL, 0)
-	ZEND_ME(reflection_function, getExtensionName, NULL, 0)
-	ZEND_ME(reflection_function, getFileName, NULL, 0)
-	ZEND_ME(reflection_function, getName, NULL, 0)
-	ZEND_ME(reflection_function, getNamespaceName, NULL, 0)
-	ZEND_ME(reflection_function, getNumberOfParameters, NULL, 0)
-	ZEND_ME(reflection_function, getNumberOfRequiredParameters, NULL, 0)
-	ZEND_ME(reflection_function, getParameters, NULL, 0)
-	ZEND_ME(reflection_function, getShortName, NULL, 0)
-	ZEND_ME(reflection_function, getStartLine, NULL, 0)
-	ZEND_ME(reflection_function, getStaticVariables, NULL, 0)
-	ZEND_ME(reflection_function, returnsReference, NULL, 0)
+	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	PHP_ABSTRACT_ME(reflection_function, __toString, arginfo_reflection__void)
+	ZEND_ME(reflection_function, inNamespace, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, isClosure, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, isDeprecated, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, isInternal, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, isUserDefined, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getDocComment, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getEndLine, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getExtension, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getExtensionName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getFileName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getNamespaceName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getNumberOfParameters, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getNumberOfRequiredParameters, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getParameters, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getShortName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getStartLine, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, getStaticVariables, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_function, returnsReference, arginfo_reflection__void, 0)
 	{NULL, NULL, NULL}
 };
 
 static const zend_function_entry reflection_function_functions[] = {
 	ZEND_ME(reflection_function, __construct, arginfo_reflection_function___construct, 0)
-	ZEND_ME(reflection_function, __toString, NULL, 0)
+	ZEND_ME(reflection_function, __toString, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_function, export, arginfo_reflection_function_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-	ZEND_ME(reflection_function, isDisabled, NULL, 0)
+	ZEND_ME(reflection_function, isDisabled, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_function, invoke, arginfo_reflection_function_invoke, 0)
 	ZEND_ME(reflection_function, invokeArgs, arginfo_reflection_function_invokeArgs, 0)
 	{NULL, NULL, NULL}
@@ -5130,20 +5133,20 @@ ZEND_END_ARG_INFO()
 static const zend_function_entry reflection_method_functions[] = {
 	ZEND_ME(reflection_method, export, arginfo_reflection_method_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_method, __construct, arginfo_reflection_method___construct, 0)
-	ZEND_ME(reflection_method, __toString, NULL, 0)
-	ZEND_ME(reflection_method, isPublic, NULL, 0)
-	ZEND_ME(reflection_method, isPrivate, NULL, 0)
-	ZEND_ME(reflection_method, isProtected, NULL, 0)
-	ZEND_ME(reflection_method, isAbstract, NULL, 0)
-	ZEND_ME(reflection_method, isFinal, NULL, 0)
-	ZEND_ME(reflection_method, isStatic, NULL, 0)
-	ZEND_ME(reflection_method, isConstructor, NULL, 0)
-	ZEND_ME(reflection_method, isDestructor, NULL, 0)
-	ZEND_ME(reflection_method, getModifiers, NULL, 0)
+	ZEND_ME(reflection_method, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isPublic, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isPrivate, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isProtected, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isAbstract, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isFinal, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isStatic, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isConstructor, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, isDestructor, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, getModifiers, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_method, invoke, arginfo_reflection_method_invoke, 0)
 	ZEND_ME(reflection_method, invokeArgs, arginfo_reflection_method_invokeArgs, 0)
-	ZEND_ME(reflection_method, getDeclaringClass, NULL, 0)
-	ZEND_ME(reflection_method, getPrototype, NULL, 0)
+	ZEND_ME(reflection_method, getDeclaringClass, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_method, getPrototype, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_property, setAccessible, arginfo_reflection_method_setAccessible, 0)
 	{NULL, NULL, NULL}
 };
@@ -5221,19 +5224,19 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_implementsInterface, 0)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_class_functions[] = {
-	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(reflection_class, export, arginfo_reflection_class_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_class, __construct, arginfo_reflection_class___construct, 0)
-	ZEND_ME(reflection_class, __toString, NULL, 0)
-	ZEND_ME(reflection_class, getName, NULL, 0)
-	ZEND_ME(reflection_class, isInternal, NULL, 0)
-	ZEND_ME(reflection_class, isUserDefined, NULL, 0)
-	ZEND_ME(reflection_class, isInstantiable, NULL, 0)
-	ZEND_ME(reflection_class, getFileName, NULL, 0)
-	ZEND_ME(reflection_class, getStartLine, NULL, 0)
-	ZEND_ME(reflection_class, getEndLine, NULL, 0)
-	ZEND_ME(reflection_class, getDocComment, NULL, 0)
-	ZEND_ME(reflection_class, getConstructor, NULL, 0)
+	ZEND_ME(reflection_class, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isInternal, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isUserDefined, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isInstantiable, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getFileName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getStartLine, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getEndLine, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getDocComment, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getConstructor, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, hasMethod, arginfo_reflection_class_hasMethod, 0)
 	ZEND_ME(reflection_class, getMethod, arginfo_reflection_class_getMethod, 0)
 	ZEND_ME(reflection_class, getMethods, arginfo_reflection_class_getMethods, 0)
@@ -5241,30 +5244,30 @@ static const zend_function_entry reflection_class_functions[] = {
 	ZEND_ME(reflection_class, getProperty, arginfo_reflection_class_getProperty, 0)
 	ZEND_ME(reflection_class, getProperties, arginfo_reflection_class_getProperties, 0)
 	ZEND_ME(reflection_class, hasConstant, arginfo_reflection_class_hasConstant, 0)
-	ZEND_ME(reflection_class, getConstants, NULL, 0)
+	ZEND_ME(reflection_class, getConstants, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, getConstant, arginfo_reflection_class_getConstant, 0)
-	ZEND_ME(reflection_class, getInterfaces, NULL, 0)
-	ZEND_ME(reflection_class, getInterfaceNames, NULL, 0)
-	ZEND_ME(reflection_class, isInterface, NULL, 0)
-	ZEND_ME(reflection_class, isAbstract, NULL, 0)
-	ZEND_ME(reflection_class, isFinal, NULL, 0)
-	ZEND_ME(reflection_class, getModifiers, NULL, 0)
+	ZEND_ME(reflection_class, getInterfaces, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getInterfaceNames, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isInterface, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isAbstract, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isFinal, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getModifiers, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, isInstance, arginfo_reflection_class_isInstance, 0)
 	ZEND_ME(reflection_class, newInstance, arginfo_reflection_class_newInstance, 0)
 	ZEND_ME(reflection_class, newInstanceArgs, arginfo_reflection_class_newInstanceArgs, 0)
-	ZEND_ME(reflection_class, getParentClass, NULL, 0)
+	ZEND_ME(reflection_class, getParentClass, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, isSubclassOf, arginfo_reflection_class_isSubclassOf, 0)
-	ZEND_ME(reflection_class, getStaticProperties, NULL, 0)
+	ZEND_ME(reflection_class, getStaticProperties, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, getStaticPropertyValue, arginfo_reflection_class_getStaticPropertyValue, 0)
 	ZEND_ME(reflection_class, setStaticPropertyValue, arginfo_reflection_class_setStaticPropertyValue, 0)
-	ZEND_ME(reflection_class, getDefaultProperties, NULL, 0)
-	ZEND_ME(reflection_class, isIterateable, NULL, 0)
+	ZEND_ME(reflection_class, getDefaultProperties, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, isIterateable, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_class, implementsInterface, arginfo_reflection_class_implementsInterface, 0)
-	ZEND_ME(reflection_class, getExtension, NULL, 0)
-	ZEND_ME(reflection_class, getExtensionName, NULL, 0)
-	ZEND_ME(reflection_class, inNamespace, NULL, 0)
-	ZEND_ME(reflection_class, getNamespaceName, NULL, 0)
-	ZEND_ME(reflection_class, getShortName, NULL, 0)
+	ZEND_ME(reflection_class, getExtension, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getExtensionName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, inNamespace, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getNamespaceName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_class, getShortName, arginfo_reflection__void, 0)
 	{NULL, NULL, NULL}
 };
 
@@ -5285,44 +5288,46 @@ static const zend_function_entry reflection_object_functions[] = {
 };
 
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 1)
-	ZEND_ARG_INFO(0, argument)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 2)
+	ZEND_ARG_INFO(0, class)
+	ZEND_ARG_INFO(0, name)
 	ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_property___construct, 0)
-	ZEND_ARG_INFO(0, argument)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property___construct, 0, 0, 0)
+	ZEND_ARG_INFO(0, class)
+	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_getValue, 0, 0, 0)
 	ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setValue, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_setValue, 0, 0, 1)
 	ZEND_ARG_INFO(0, object)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setAccessible, 0)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_INFO(0, visible)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_property_functions[] = {
-	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(reflection_property, export, arginfo_reflection_property_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_property, __construct, arginfo_reflection_property___construct, 0)
-	ZEND_ME(reflection_property, __toString, NULL, 0)
-	ZEND_ME(reflection_property, getName, NULL, 0)
+	ZEND_ME(reflection_property, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, getName, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_property, getValue, arginfo_reflection_property_getValue, 0)
 	ZEND_ME(reflection_property, setValue, arginfo_reflection_property_setValue, 0)
-	ZEND_ME(reflection_property, isPublic, NULL, 0)
-	ZEND_ME(reflection_property, isPrivate, NULL, 0)
-	ZEND_ME(reflection_property, isProtected, NULL, 0)
-	ZEND_ME(reflection_property, isStatic, NULL, 0)
-	ZEND_ME(reflection_property, isDefault, NULL, 0)
-	ZEND_ME(reflection_property, getModifiers, NULL, 0)
-	ZEND_ME(reflection_property, getDeclaringClass, NULL, 0)
-	ZEND_ME(reflection_property, getDocComment, NULL, 0)
+	ZEND_ME(reflection_property, isPublic, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, isPrivate, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, isProtected, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, isStatic, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, isDefault, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, getModifiers, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, getDeclaringClass, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_property, getDocComment, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_property, setAccessible, arginfo_reflection_property_setAccessible, 0)
 	{NULL, NULL, NULL}
 };
@@ -5339,21 +5344,21 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_parameter___construct, 0)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_parameter_functions[] = {
-	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(reflection_parameter, export, arginfo_reflection_parameter_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_parameter, __construct, arginfo_reflection_parameter___construct, 0)
-	ZEND_ME(reflection_parameter, __toString, NULL, 0)
-	ZEND_ME(reflection_parameter, getName, NULL, 0)
-	ZEND_ME(reflection_parameter, isPassedByReference, NULL, 0)
-	ZEND_ME(reflection_parameter, getDeclaringFunction, NULL, 0)
-	ZEND_ME(reflection_parameter, getDeclaringClass, NULL, 0)
-	ZEND_ME(reflection_parameter, getClass, NULL, 0)
-	ZEND_ME(reflection_parameter, isArray, NULL, 0)
-	ZEND_ME(reflection_parameter, allowsNull, NULL, 0)
-	ZEND_ME(reflection_parameter, getPosition, NULL, 0)
-	ZEND_ME(reflection_parameter, isOptional, NULL, 0)
-	ZEND_ME(reflection_parameter, isDefaultValueAvailable, NULL, 0)
-	ZEND_ME(reflection_parameter, getDefaultValue, NULL, 0)
+	ZEND_ME(reflection_parameter, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, isPassedByReference, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getDeclaringFunction, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getDeclaringClass, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getClass, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, isArray, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, allowsNull, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getPosition, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, isOptional, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, isDefaultValueAvailable, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_parameter, getDefaultValue, arginfo_reflection__void, 0)
 	{NULL, NULL, NULL}
 };
 
@@ -5367,19 +5372,19 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_extension___construct, 0)
 ZEND_END_ARG_INFO()
 
 static const zend_function_entry reflection_extension_functions[] = {
-	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(reflection_extension, export, arginfo_reflection_extension_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_extension, __construct, arginfo_reflection_extension___construct, 0)
-	ZEND_ME(reflection_extension, __toString, NULL, 0)
-	ZEND_ME(reflection_extension, getName, NULL, 0)
-	ZEND_ME(reflection_extension, getVersion, NULL, 0)
-	ZEND_ME(reflection_extension, getFunctions, NULL, 0)
-	ZEND_ME(reflection_extension, getConstants, NULL, 0)
-	ZEND_ME(reflection_extension, getINIEntries, NULL, 0)
-	ZEND_ME(reflection_extension, getClasses, NULL, 0)
-	ZEND_ME(reflection_extension, getClassNames, NULL, 0)
-	ZEND_ME(reflection_extension, getDependencies, NULL, 0)
-	ZEND_ME(reflection_extension, info, NULL, 0)
+	ZEND_ME(reflection_extension, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getName, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getVersion, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getFunctions, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getConstants, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getINIEntries, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getClasses, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getClassNames, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, getDependencies, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_extension, info, arginfo_reflection__void, 0)
 	{NULL, NULL, NULL}
 };
 /* }}} */
diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
index bf2221c78d..6173cf0c0a 100644
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -36,6 +36,9 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
 
   - Methods [43] {
     Method [ <internal:Reflection> final private method __clone ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection, ctor> public method __construct ] {
@@ -46,33 +49,63 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method __toString ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getName ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isInternal ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isUserDefined ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isInstantiable ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getFileName ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getStartLine ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getEndLine ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getDocComment ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getConstructor ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method hasMethod ] {
@@ -125,6 +158,9 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getConstants ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getConstant ] {
@@ -135,21 +171,39 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getInterfaces ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getInterfaceNames ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isInterface ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isAbstract ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isFinal ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getModifiers ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isInstance ] {
@@ -174,6 +228,9 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getParentClass ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isSubclassOf ] {
@@ -184,6 +241,9 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getStaticProperties ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getStaticPropertyValue ] {
@@ -203,9 +263,15 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getDefaultProperties ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method isIterateable ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method implementsInterface ] {
@@ -216,18 +282,33 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     }
 
     Method [ <internal:Reflection> public method getExtension ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getExtensionName ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method inNamespace ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getNamespaceName ] {
+
+      - Parameters [0] {
+      }
     }
 
     Method [ <internal:Reflection> public method getShortName ] {
+
+      - Parameters [0] {
+      }
     }
   }
 }
diff --git a/ext/reflection/tests/ReflectionMethod_basic2.phpt b/ext/reflection/tests/ReflectionMethod_basic2.phpt
index 1e21c427e4..e2c23c1c15 100644
--- a/ext/reflection/tests/ReflectionMethod_basic2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_basic2.phpt
@@ -152,8 +152,9 @@ Reflecting on method ReflectionProperty::__construct()
 __toString():
 string(%d) "Method [ <internal:Reflection, ctor> public method __construct ] {
 
-  - Parameters [1] {
-    Parameter #0 [ <required> $argument ]
+  - Parameters [2] {
+    Parameter #0 [ <optional> $class ]
+    Parameter #1 [ <optional> $name ]
   }
 }
 "
@@ -161,8 +162,9 @@ string(%d) "Method [ <internal:Reflection, ctor> public method __construct ] {
 export():
 string(%d) "Method [ <internal:Reflection, ctor> public method __construct ] {
 
-  - Parameters [1] {
-    Parameter #0 [ <required> $argument ]
+  - Parameters [2] {
+    Parameter #0 [ <optional> $class ]
+    Parameter #1 [ <optional> $name ]
   }
 }
 "