Address minor review comments

Author: Girgias

Zend/zend_compile.c

@@ -6763,14 +6763,11 @@ static void zend_is_type_list_redundant_by_single_type(zend_type_list *type_list
 		}
 		if (zend_string_equals_ci(ZEND_TYPE_NAME(type_list->types[i]), ZEND_TYPE_NAME(type))) {
 			zend_string *single_type_str = zend_type_to_string(type);
-			if (
-				ZEND_TYPE_IS_RELATIVE_SELF(type)
-				|| ZEND_TYPE_IS_RELATIVE_PARENT(type)
-			) {
+			if (ZEND_TYPE_IS_RELATIVE_TYPE(type)) {
 				if ( (
 					ZEND_TYPE_FULL_MASK(type)
 					& ZEND_TYPE_FULL_MASK(type_list->types[i])
-					& (_ZEND_TYPE_SELF_BIT|_ZEND_TYPE_PARENT_BIT)) != 0
+					& (_ZEND_TYPE_RELATIVE_TYPE_MASK)) != 0
 				) {
 					zend_error_noreturn(E_COMPILE_ERROR, "Duplicate type %s is redundant", ZSTR_VAL(single_type_str));
 				}
@@ -6779,10 +6776,7 @@ static void zend_is_type_list_redundant_by_single_type(zend_type_list *type_list
 				zend_error_noreturn(E_COMPILE_ERROR, "%s resolves to %s which is redundant",
 					ZSTR_VAL(single_type_str), ZSTR_VAL(ZEND_TYPE_NAME(type))
 				);
-			} else if (
-				ZEND_TYPE_IS_RELATIVE_SELF(type_list->types[i])
-				|| ZEND_TYPE_IS_RELATIVE_PARENT(type_list->types[i])
-			) {
+			} else if (ZEND_TYPE_IS_RELATIVE_TYPE(type_list->types[i])) {
 				/* zend_type_to_string() will return "self" or "parent" where the resolved type is stored in
 				 * ZEND_TYPE_NAME() */
 				zend_error_noreturn(E_COMPILE_ERROR, "%s resolves to %s which is redundant",

Zend/zend_inheritance.c

@@ -2003,7 +2003,7 @@ static zend_type zend_resolve_single_type(zend_type type, const zend_class_entry
 		}
 
 		zend_type resolved_type = zend_resolve_name_type(single_type, ce);
-		if (zend_was_type_resolved(type, resolved_type)) {
+		if (zend_was_type_resolved(single_type, resolved_type)) {
 			if (!has_resolved_type) {
 				const zend_type_list *old_union_type_list = ZEND_TYPE_LIST(type);
 				union_type_list = zend_arena_alloc(&CG(arena), ZEND_TYPE_LIST_SIZE(old_union_type_list->num_types));

Zend/zend_types.h

@@ -171,6 +171,9 @@ typedef struct {
 	(((t).type_mask & _ZEND_TYPE_MASK) != 0)
 
 
+/* To determine if the type resolved type was written with "self" or "parent" */
+#define ZEND_TYPE_IS_RELATIVE_TYPE(t) \
+	((((t).type_mask) & _ZEND_TYPE_RELATIVE_TYPE_MASK) != 0)
 /* To determine if the type resolved type was written with "self" */
 #define ZEND_TYPE_IS_RELATIVE_SELF(t) \
 	((((t).type_mask) & _ZEND_TYPE_SELF_BIT) != 0)

ext/reflection/php_reflection.c

@@ -1338,9 +1338,9 @@ static void reflection_parameter_factory(zend_function *fptr, zval *closure_obje
 
 typedef enum {
 	NAMED_TYPE = 0,
-	RELATIVE_TYPE = 3,
 	UNION_TYPE = 1,
-	INTERSECTION_TYPE = 2
+	INTERSECTION_TYPE = 2,
+	RELATIVE_TYPE = 3
 } reflection_type_kind;
 
 /* For backwards compatibility reasons, we need to return T|null style unions
@@ -1368,7 +1368,7 @@ static reflection_type_kind get_type_kind(zend_type type) {
 		}
 
 		ZEND_ASSERT(ZEND_TYPE_HAS_NAME(type));
-		if (ZEND_TYPE_IS_RELATIVE_SELF(type) || ZEND_TYPE_IS_RELATIVE_PARENT(type)) {
+		if (ZEND_TYPE_IS_RELATIVE_TYPE(type)) {
 			return RELATIVE_TYPE;
 		}
 		return NAMED_TYPE;
@@ -1381,7 +1381,6 @@ static reflection_type_kind get_type_kind(zend_type type) {
 		return UNION_TYPE;
 	}
 
-	/* "static" is a relative type */
 	if (type_mask_without_null == MAY_BE_STATIC) {
 		return RELATIVE_TYPE;
 	}
@@ -3160,7 +3159,7 @@ ZEND_METHOD(ReflectionRelativeClassType, resolveToNamedType)
 		}
 		resolved_type = (zend_type) ZEND_TYPE_INIT_CLASS(intern->ce->name, allows_null, /*extra flags */ 0);
 	} else {
-		ZEND_ASSERT(ZEND_TYPE_IS_RELATIVE_SELF(param->type) || ZEND_TYPE_IS_RELATIVE_PARENT(param->type));
+		ZEND_ASSERT(ZEND_TYPE_IS_RELATIVE_TYPE(param->type));
 		ZEND_ASSERT(ZEND_TYPE_HAS_NAME(param->type));
 		resolved_type = (zend_type) ZEND_TYPE_INIT_CLASS(ZEND_TYPE_NAME(param->type), allows_null, /*extra flags */ 0);
 	}