Register classes for intersection types

Girgias · Girgias · commit fce561a45d26 · 2021-05-04T15:13:19.000+01:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -650,8 +650,26 @@ static inheritance_status zend_perform_covariant_type_check(
 	}
 
 	/* Register all classes that may have to be resolved */
-	if (ZEND_TYPE_IS_INTERSECTION(fe_type)) {
-		// TODO Register intersection type classes
+	if (UNEXPECTED(ZEND_TYPE_IS_INTERSECTION(fe_type))) {
+		ZEND_TYPE_FOREACH(proto_type, single_type) {
+			zend_string *proto_class_name;
+			zend_class_entry *proto_ce = NULL;
+
+			if (ZEND_TYPE_HAS_NAME(*single_type)) {
+				proto_class_name = resolve_class_name(proto_scope, ZEND_TYPE_NAME(*single_type));
+			} else if (ZEND_TYPE_HAS_CE(*single_type)) {
+				proto_ce = ZEND_TYPE_CE(*single_type);
+				proto_class_name = proto_ce->name;
+			} else {
+				/* standard type */
+				ZEND_ASSERT(0 && "This shouldn't happen yet");
+				continue;
+			}
+
+			zend_perform_intersection_covariant_class_type_check(proto_scope,
+				proto_class_name, proto_ce, fe_scope, fe_type,
+				/* register_unresolved */ true);
+		} ZEND_TYPE_FOREACH_END();
 	} else {
 		ZEND_TYPE_FOREACH(fe_type, single_type) {
 			zend_string *fe_class_name;
