Fix after review

Author: Girgias

Zend/zend_inheritance.c

@@ -407,8 +407,8 @@ static inheritance_status zend_perform_intersection_covariant_class_type_check(
 	bool have_unresolved = false;
 	zend_type *single_type;
 
-	/* Traverse the list of child types and check if it is either a subtype
-	 * of one of the parent types OR is not in the parent type list */
+	/* Traverse the list of child types and check that at least one is
+	 * a subtype of the parent type being checked */
 	ZEND_TYPE_FOREACH(fe_type, single_type) {
 		zend_class_entry *fe_ce;
 		zend_string *fe_class_name = NULL;
@@ -427,7 +427,7 @@ static inheritance_status zend_perform_intersection_covariant_class_type_check(
 			fe_ce = ZEND_TYPE_CE(*single_type);
 		} else {
 			/* standard type */
-			ZEND_ASSERT(0 && "This shouldn't happen yet");
+			ZEND_UNREACHABLE();
 			continue;
 		}
 
@@ -542,7 +542,7 @@ static inheritance_status zend_is_single_type_subtype_intersection(
 			proto_ce = ZEND_TYPE_CE(*single_type);
 		} else {
 			/* standard type cannot be part a subtype of an intersection type */
-			ZEND_ASSERT(0 && "This shouldn't happen yet");
+			ZEND_UNREACHABLE();
 			continue;
 		}
 
@@ -612,7 +612,7 @@ static inheritance_status zend_perform_covariant_type_check(
 	bool all_success = true;
 
 	/* If the child type is an intersection type then we need to loop over
-	 * the parents firstFor intersection types loop over the parent types first
+	 * the parents first. For intersection types, loop over the parent types first
 	 * as the child can add types, however none of them can be a supertype of
 	 * a parent type. */
 	if (ZEND_TYPE_IS_INTERSECTION(fe_type)) {
@@ -629,7 +629,7 @@ static inheritance_status zend_perform_covariant_type_check(
 				proto_class_name = proto_ce->name;
 			} else {
 				/* standard type */
-				ZEND_ASSERT(0 && "This shouldn't happen yet");
+				ZEND_UNREACHABLE();
 				continue;
 			}
 
@@ -698,7 +698,7 @@ static inheritance_status zend_perform_covariant_type_check(
 				proto_class_name = proto_ce->name;
 			} else {
 				/* standard type */
-				ZEND_ASSERT(0 && "This shouldn't happen yet");
+				ZEND_UNREACHABLE();
 				continue;
 			}
 

ext/reflection/php_reflection.c

@@ -1320,7 +1320,7 @@ static void reflection_parameter_factory(zend_function *fptr, zval *closure_obje
 }
 /* }}} */
 
-typedef enum reflection_type_kind {
+typedef enum {
 	NAMED_TYPE = 0,
 	UNION_TYPE = 1,
 	INTERSECTION_TYPE = 2