Handle union&intersection types in the same loop for typed properties

Author: Girgias

Zend/zend_execute.c

@@ -846,74 +846,49 @@ static zend_class_entry *resolve_single_class_type(zend_string *name, zend_class
 }
 
 // TODO Handle complex types when added
-// TODO Update to handle union and intersection in the same loop
 static bool zend_check_and_resolve_property_class_type(
 		zend_property_info *info, zend_class_entry *object_ce) {
 	zend_class_entry *ce;
 	if (ZEND_TYPE_HAS_LIST(info->type)) {
 		zend_type *list_type;
+		bool has_intersection = ZEND_TYPE_HAS_INTERSECTION(info->type);
 
-		if (ZEND_TYPE_HAS_INTERSECTION(info->type)) {
-			ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(info->type), list_type) {
-				if (ZEND_TYPE_HAS_NAME(*list_type)) {
-					if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
-						ce = ZEND_TYPE_CE_CACHE(*list_type);
-						if (!ce) {
-							zend_string *name = ZEND_TYPE_NAME(*list_type);
-							ce = resolve_single_class_type(name, info->ce);
-							if (UNEXPECTED(!ce)) {
-								continue;
-							}
-							ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
-						}
-					} else {
+		ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(info->type), list_type) {
+			if (ZEND_TYPE_HAS_NAME(*list_type)) {
+				if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
+					ce = ZEND_TYPE_CE_CACHE(*list_type);
+					if (!ce) {
 						zend_string *name = ZEND_TYPE_NAME(*list_type);
 						ce = resolve_single_class_type(name, info->ce);
-						if (!ce) {
+						if (UNEXPECTED(!ce)) {
 							continue;
 						}
-						zend_string_release(name);
-						ZEND_TYPE_SET_CE(*list_type, ce);
+						ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
 					}
 				} else {
-					ce = ZEND_TYPE_CE(*list_type);
+					zend_string *name = ZEND_TYPE_NAME(*list_type);
+					ce = resolve_single_class_type(name, info->ce);
+					if (!ce) {
+						continue;
+					}
+					zend_string_release(name);
+					ZEND_TYPE_SET_CE(*list_type, ce);
 				}
+			} else {
+				ce = ZEND_TYPE_CE(*list_type);
+			}
+			if (UNEXPECTED(has_intersection)) {
 				if (!instanceof_function(object_ce, ce)) {
 					return false;
 				}
-			} ZEND_TYPE_LIST_FOREACH_END();
-			return true;
-		} else {
-			ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(info->type), list_type) {
-				if (ZEND_TYPE_HAS_NAME(*list_type)) {
-					if (ZEND_TYPE_HAS_CE_CACHE(*list_type)) {
-						ce = ZEND_TYPE_CE_CACHE(*list_type);
-						if (!ce) {
-							zend_string *name = ZEND_TYPE_NAME(*list_type);
-							ce = resolve_single_class_type(name, info->ce);
-							if (UNEXPECTED(!ce)) {
-								continue;
-							}
-							ZEND_TYPE_SET_CE_CACHE(*list_type, ce);
-						}
-					} else {
-						zend_string *name = ZEND_TYPE_NAME(*list_type);
-						ce = resolve_single_class_type(name, info->ce);
-						if (!ce) {
-							continue;
-						}
-						zend_string_release(name);
-						ZEND_TYPE_SET_CE(*list_type, ce);
-					}
-				} else {
-					ce = ZEND_TYPE_CE(*list_type);
-				}
-				if (instanceof_function(object_ce, ce)) {
-					return 1;
-				}
-			} ZEND_TYPE_LIST_FOREACH_END();
-			return 0;
-		}
+			} else if (instanceof_function(object_ce, ce)) {
+				return true;
+			}
+		} ZEND_TYPE_LIST_FOREACH_END();
+		/* If type is an intersection reaching the end of the loop
+		 * means the type has validated, for union types it means
+		 * it has failed */
+		return has_intersection;
 	} else {
 		if (UNEXPECTED(ZEND_TYPE_HAS_NAME(info->type))) {
 			if (ZEND_TYPE_HAS_CE_CACHE(info->type)) {