Merge branch 'PHP-5.5' into PHP-5.6

Author: johannes

ext/reflection/php_reflection.c

@@ -5705,7 +5705,7 @@ static const zend_function_entry reflection_exception_functions[] = {
 PHP_FE_END
 };
 
-ZEND_BEGIN_ARG_INFO(arginfo_reflection__void, 0)
+ZEND_BEGIN_ARG_INF(arginfo_reflection__void, 0)
 ZEND_END_ARG_INFO()
 
 
@@ -6098,7 +6098,7 @@ ZEND_END_ARG_INFO()
 static const zend_function_entry reflection_zend_extension_functions[] = {
 ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 ZEND_ME(reflection_zend_extension, export, arginfo_reflection_extension_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_extension___construct, 0)
+ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_zend_extension___construct, 0)
 ZEND_ME(reflection_zend_extension, __toString, arginfo_reflection__void, 0)
 ZEND_ME(reflection_zend_extension, getName, arginfo_reflection__void, 0)
 ZEND_ME(reflection_zend_extension, getVersion, arginfo_reflection__void, 0)