Rebase fixup

nikic · nikic · commit 2170f7bfdf82 · 2021-06-30T15:48:51.000+02:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -631,7 +631,7 @@ static inheritance_status zend_perform_covariant_type_check(
 		 * subtype of a parent single/intersection type, either it is an INvalid subtype
 		 * when the parent is a union or it is unresolved, we check which case this is */
 		if (ZEND_TYPE_IS_UNION(proto_type) && !parent_union_has_unresolved) {
-			return tentative ? INHERITANCE_WARNING : INHERITANCE_ERROR;
+			return INHERITANCE_ERROR;
 		}
 	} else {
 		/* First try to check whether we can succeed without resolving anything */

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ static inheritance_status zend_perform_covariant_type_check(`
`631`	`631`	`* subtype of a parent single/intersection type, either it is an INvalid subtype`
`632`	`632`	`* when the parent is a union or it is unresolved, we check which case this is */`
`633`	`633`	`if (ZEND_TYPE_IS_UNION(proto_type) && !parent_union_has_unresolved) {`
`634`		`- return tentative ? INHERITANCE_WARNING : INHERITANCE_ERROR;`
	`634`	`+ return INHERITANCE_ERROR;`
`635`	`635`	`}`
`636`	`636`	`} else {`
`637`	`637`	`/* First try to check whether we can succeed without resolving anything */`