Nits

Author: Girgias

Zend/zend_compile.c

@@ -6281,20 +6281,22 @@ static zend_type zend_compile_typename(
 			uint32_t single_type_mask;
 
 			if (type_ast->kind == ZEND_AST_TYPE_INTERSECTION) {
-				if (type_list->num_types == 0) {
-					/* The first class type can be stored directly as the type ptr payload. */
-					if (ZEND_TYPE_HAS_NAME(type) || ZEND_TYPE_HAS_CE(type) || ZEND_TYPE_HAS_CE_CACHE(type)) {
-						/* Switch from single name to name list. */
-						type_list->num_types = 1;
-						type_list->types[0] = type;
-						ZEND_TYPE_FULL_MASK(type_list->types[0]) &= ~_ZEND_TYPE_MAY_BE_MASK;
-					}
-					/* TODO Check for trivially redundant class types? */
+				/* The first class type can be stored directly as the type ptr payload. */
+				if (ZEND_TYPE_IS_COMPLEX(type) && !ZEND_TYPE_HAS_LIST(type)) {
+					/* Switch from single name to name list. */
+					type_list->num_types = 1;
+					type_list->types[0] = type;
+					/* Reset flags for first type */
+					ZEND_TYPE_FULL_MASK(type_list->types[0]) &= ~_ZEND_TYPE_MAY_BE_MASK;
 					ZEND_TYPE_SET_LIST(type, type_list);
 				}
 
 				single_type = zend_compile_typename(type_ast, false);
+				ZEND_ASSERT(ZEND_TYPE_IS_INTERSECTION(single_type));
+
 				type_list->types[type_list->num_types++] = single_type;
+
+				/* TODO Check for trivially redundant class types? */
 				continue;
 			}