Fixup reflection after rebase

nikic · nikic · commit 59802bbd1377 · 2019-11-07T15:14:54.000+01:00
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -231,7 +231,14 @@ static void reflection_free_objects_storage(zend_object *object) /* {{{ */
 		case REF_TYPE_TYPE:
 		{
 			type_reference *type_ref = intern->ptr;
-			if (ZEND_TYPE_IS_NAME(type_ref->type)) {
+			if (ZEND_TYPE_HAS_LIST(type_ref->type)) {
+				void *entry;
+				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(type_ref->type), entry) {
+					if (ZEND_TYPE_LIST_IS_NAME(entry)) {
+						zend_string_release(ZEND_TYPE_LIST_GET_NAME(entry));
+					}
+				} ZEND_TYPE_LIST_FOREACH_END();
+			} else if (ZEND_TYPE_HAS_NAME(type_ref->type)) {
 				zend_string_release(ZEND_TYPE_NAME(type_ref->type));
 			}
 			efree(type_ref);
@@ -1169,7 +1176,14 @@ static void reflection_type_factory(zend_type type, zval *object, zend_bool lega
 
 	/* Property types may be resolved during the lifetime of the ReflectionType,
 	 * so we need to make sure that the strings we reference are not released. */
-	if (ZEND_TYPE_IS_NAME(type)) {
+	if (ZEND_TYPE_HAS_LIST(type)) {
+		void *entry;
+		ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(type), entry) {
+			if (ZEND_TYPE_LIST_IS_NAME(entry)) {
+				zend_string_addref(ZEND_TYPE_LIST_GET_NAME(entry));
+			}
+		} ZEND_TYPE_LIST_FOREACH_END();
+	} else if (ZEND_TYPE_HAS_NAME(type)) {
 		zend_string_addref(ZEND_TYPE_NAME(type));
 	}
 }
@@ -6535,7 +6549,7 @@ static const zend_function_entry reflection_named_type_functions[] = {
 };
 
 static const zend_function_entry reflection_union_type_functions[] = {
-	ZEND_ME(reflection_union_type, getTypes, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_union_type, getTypes, arginfo_class_ReflectionUnionType_getTypes, 0)
 	PHP_FE_END
 };
 
diff --git a/ext/reflection/reflection.stub.php b/ext/reflection/reflection.stub.php
@@ -552,6 +552,11 @@ public function getName() {}
     public function isBuiltin() {}
 }
 
+class ReflectionUnionType extends ReflectionType
+{
+    public function getTypes(): array {}
+}
+
 class ReflectionExtension implements Reflector
 {
     final private function __clone() {}
diff --git a/ext/reflection/reflection_arginfo.h b/ext/reflection/reflection_arginfo.h
@@ -428,6 +428,9 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ReflectionNamedType_isBuiltin arginfo_class_Reflector___toString
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionUnionType_getTypes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 #define arginfo_class_ReflectionExtension___clone arginfo_class_Reflector___toString
 
 #define arginfo_class_ReflectionExtension_export arginfo_class_ReflectionFunction_export

Original file line number	Diff line number	Diff line change
`@@ -552,6 +552,11 @@ public function getName() {}`
`552`	`552`	`public function isBuiltin() {}`
`553`	`553`	`}`
`554`	`554`
	`555`	`+class ReflectionUnionType extends ReflectionType`
	`556`	`+{`
	`557`	`+ public function getTypes(): array {}`
	`558`	`+}`
	`559`	`+`
`555`	`560`	`class ReflectionExtension implements Reflector`
`556`	`561`	`{`
`557`	`562`	`final private function __clone() {}`