Skip to content

Commit 6f4945d

Browse files
committed
Point to iterable for incompatible type in intersection
1 parent ec1d5c8 commit 6f4945d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Zend/tests/type_declarations/intersection_types/invalid_types/invalid_iterable_type.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ function foo(): iterable&Iterator {}
77

88
?>
99
--EXPECTF--
10-
Fatal error: Type Traversable|array cannot be part of an intersection type in %s on line %d
10+
Fatal error: Type iterable cannot be part of an intersection type in %s on line %d

Zend/zend_compile.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6276,7 +6276,11 @@ static zend_type zend_compile_typename(
62766276
zend_type single_type = zend_compile_single_typename(type_ast);
62776277

62786278
/* An intersection of standard types cannot exist so invalidate it */
6279-
if (ZEND_TYPE_PURE_MASK(single_type)) {
6279+
/* Check for iterable early */
6280+
if (ZEND_TYPE_IS_ITERABLE_FALLBACK(single_type)) {
6281+
zend_error_noreturn(E_COMPILE_ERROR, "Type iterable cannot be part of an intersection type");
6282+
}
6283+
if (ZEND_TYPE_IS_ONLY_MASK(single_type)) {
62806284
zend_string *standard_type_str = zend_type_to_string(single_type);
62816285
zend_error_noreturn(E_COMPILE_ERROR,
62826286
"Type %s cannot be part of an intersection type", ZSTR_VAL(standard_type_str));

0 commit comments

Comments
 (0)