Fix another bunch of tests

Author: kocsismate

Zend/zend_closures.c

@@ -480,6 +480,7 @@ ZEND_API zend_function *zend_get_closure_invoke_method(zend_object *object) /* {
 			ZEND_ACC_USER_ARG_INFO;
 	}
 	invoke->internal_function.handler = ZEND_MN(Closure___invoke);
+	invoke->internal_function.doc_comment = NULL;
 	invoke->internal_function.module = 0;
 	invoke->internal_function.scope = zend_ce_closure;
 	invoke->internal_function.function_name = ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE);
@@ -865,6 +866,7 @@ void zend_closure_from_frame(zval *return_value, zend_execute_data *call) { /* {
 		trampoline.handler = zend_closure_call_magic;
 		trampoline.function_name = mptr->common.function_name;
 		trampoline.scope = mptr->common.scope;
+		trampoline.doc_comment = NULL;
 		if (trampoline.fn_flags & ZEND_ACC_VARIADIC) {
 			trampoline.arg_info = trampoline_arg_info;
 		}

Zend/zend_compile.h

@@ -525,8 +525,8 @@ typedef struct _zend_internal_function {
 	uint32_t T;         /* number of temporary variables */
 	/* END of common elements */
 
-	zend_string *doc_comment;
 	zif_handler handler;
+	zend_string *doc_comment;
 	struct _zend_module_entry *module;
 	const zend_frameless_function_info *frameless_function_infos;
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];

Zend/zend_execute.c

@@ -150,8 +150,8 @@ ZEND_API const zend_internal_function zend_pass_function = {
 	NULL,                   /* attributes        */
 	NULL,                   /* run_time_cache    */
 	0,                      /* T                 */
-	NULL,                /* doc_comment */
 	ZEND_FN(pass),          /* handler           */
+	NULL,                   /* doc_comment       */
 	NULL,                   /* module            */
 	NULL,                   /* frameless_function_infos */
 	{NULL,NULL,NULL,NULL}   /* reserved          */

ext/com_dotnet/com_handlers.c

@@ -311,6 +311,7 @@ static zend_function *com_method_get(zend_object **object_ptr, zend_string *name
 		f.fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
 		f.function_name = zend_string_copy(name);
 		f.handler = PHP_FN(com_method_handler);
+		f.doc_comment = NULL;
 
 		fptr = &f;
 

ext/pdo/pdo_dbh.c

@@ -1336,6 +1336,7 @@ bool pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind)
 		} else {
 			func.fn_flags = ZEND_ACC_PUBLIC | ZEND_ACC_NEVER_CACHE;
 		}
+		func.doc_comment = NULL;
 		if (funcs->arg_info) {
 			zend_internal_function_info *info = (zend_internal_function_info*)funcs->arg_info;
 

ext/reflection/php_reflection.c

@@ -895,7 +895,7 @@ static zval *property_get_default(zend_property_info *prop_info) {
 /* {{{ _property_string */
 static void _property_string(smart_str *str, zend_property_info *prop, const char *prop_name, char* indent)
 {
-	if (prop->doc_comment) {
+	if (prop && prop->doc_comment) {
 		smart_str_append_printf(str, "%s%s\n", indent, ZSTR_VAL(prop->doc_comment));
 	}
 	smart_str_append_printf(str, "%sProperty [ ", indent);
@@ -1929,7 +1929,9 @@ ZEND_METHOD(ReflectionFunctionAbstract, getDocComment)
 
 	if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.doc_comment) {
 		RETURN_STR_COPY(fptr->op_array.doc_comment);
-	} else if (fptr->type == ZEND_INTERNAL_FUNCTION && ((zend_internal_function *) fptr)->doc_comment) {
+	}
+
+	if (fptr->type == ZEND_INTERNAL_FUNCTION && ((zend_internal_function *) fptr)->doc_comment) {
 		RETURN_STR_COPY(((zend_internal_function *) fptr)->doc_comment);
 	}
 

ext/reflection/tests/ReflectionClassConstant_basic1.phpt

@@ -57,7 +57,8 @@ reflectClassConstant($instance, "BAD_CONST");
 Reflecting on class constant TestClass::PUB
 
 __toString():
-string(35) "Constant [ public bool PUB ] { 1 }
+string(57) "/** My Doc comment */
+Constant [ public bool PUB ] { 1 }
 "
 getName():
 string(3) "PUB"
@@ -89,7 +90,8 @@ bool
 Reflecting on class constant TestClass::PROT
 
 __toString():
-string(38) "Constant [ protected int PROT ] { 4 }
+string(65) "/** Another doc comment */
+Constant [ protected int PROT ] { 4 }
 "
 getName():
 string(4) "PROT"

ext/reflection/tests/constructor_promotion.phpt

@@ -46,6 +46,7 @@ Class [ <user> class Test ] {
   - Properties [3] {
     Property [ public $z = NULL ]
     Property [ public int $x ]
+    /** @SomeAnnotation() */
     Property [ public string $y ]
   }