php · Girgias · Jul 5, 2021 · Mar 14, 2021 · Mar 18, 2021 · Apr 23, 2021
diff --git a/UPGRADING b/UPGRADING
@@ -64,6 +64,9 @@ PHP 8.1 UPGRADE NOTES
    PHP cross-version compatibility concerns, a `#[ReturnTypeWillChange]`
    attribute can be added to silence the deprecation notice.
    RFC: https://wiki.php.net/rfc/internal_method_return_types
+  . Added support for intersection types.
+    They cannot be combined with union types.
+    RFC: https://wiki.php.net/rfc/pure-intersection-types

 - Fileinfo:
  . The fileinfo functions now accept and return, respectively, finfo objects
@@ -307,7 +310,7 @@ PHP 8.1 UPGRADE NOTES
    Previously, -a without readline had the same behavior as calling php without
    any arguments, apart from printing an additional "Interactive mode enabled"
    message. This mode was not, in fact, interactive.
-    
+
 - phpdbg:
  . Remote functionality from phpdbg has been removed.

@@ -453,7 +456,7 @@ PHP 8.1 UPGRADE NOTES
    MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
    constant is still available for backwards-compatibility reasons, but may
    be deprecated/removed in the future.
-    
+
 - Sockets:
  . TCP_DEFER_ACCEPT socket option added where available.


@@ -73,7 +73,7 @@ static size_t type_num_classes(const zend_op_array *op_array, uint32_t arg_num)
 		arg_info = op_array->arg_info - 1;
 	}

-	if (ZEND_TYPE_HAS_CLASS(arg_info->type)) {
+	if (ZEND_TYPE_IS_COMPLEX(arg_info->type)) {
 		if (ZEND_TYPE_HAS_LIST(arg_info->type)) {
 			return ZEND_TYPE_LIST(arg_info->type)->num_types;
 		}

@@ -310,19 +310,23 @@ static inline bool can_elide_return_type_check(
 		return true;
 	}

-	if (disallowed_types == MAY_BE_OBJECT && use_info->ce && ZEND_TYPE_HAS_CLASS(arg_info->type)) {
+	if (disallowed_types == MAY_BE_OBJECT && use_info->ce && ZEND_TYPE_IS_COMPLEX(arg_info->type)) {
 		zend_type *single_type;
+		/* For intersection: result==false is failure, default is success.
+		 * For union: result==true is success, default is failure. */
+		bool is_intersection = ZEND_TYPE_IS_INTERSECTION(arg_info->type);
 		ZEND_TYPE_FOREACH(arg_info->type, single_type) {
 			if (ZEND_TYPE_HAS_NAME(*single_type)) {
 				zend_string *lcname = zend_string_tolower(ZEND_TYPE_NAME(*single_type));
 				zend_class_entry *ce = zend_optimizer_get_class_entry(script, lcname);
 				zend_string_release(lcname);
-				if (ce && safe_instanceof(use_info->ce, ce)) {
-					/* One of the class union types matched. */
-					return true;
+				bool result = ce && safe_instanceof(use_info->ce, ce);
+				if (result == !is_intersection) {
+					return result;
 				}
 			}
 		} ZEND_TYPE_FOREACH_END();
+		return is_intersection;
 	}

 	return false;

@@ -2221,7 +2221,7 @@ static uint32_t zend_convert_type(const zend_script *script, zend_type type, zen
 	}

 	uint32_t tmp = zend_convert_type_declaration_mask(ZEND_TYPE_PURE_MASK(type));
-	if (ZEND_TYPE_HAS_CLASS(type)) {
+	if (ZEND_TYPE_IS_COMPLEX(type)) {
 		tmp |= MAY_BE_OBJECT;
 		if (pce) {
 			/* As we only have space to store one CE,

diff --git a/Zend/tests/type_declarations/intersection_types/added_interface_intersection_type.phpt b/Zend/tests/type_declarations/intersection_types/added_interface_intersection_type.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Added element of intersection type
+--FILE--
+<?php
+
+interface X {}
+interface Y {}
+interface Z {}
+
+class A implements X, Y, Z {}
+
+class Collection {
+    public X&Y $intersect;
+}
+
+function foo(): X&Y {
+    return new A();
+}
+
+function bar(X&Y $o): void {
+    var_dump($o);
+}
+
+$o = foo();
+var_dump($o);
+
+$c = new Collection();
+$a = new A();
+
+$c->intersect = $a;
+echo 'OK', \PHP_EOL;
+bar($a);
+?>
+--EXPECT--
+object(A)#1 (0) {
+}
+OK
+object(A)#3 (0) {
+}
diff --git a/Zend/tests/type_declarations/intersection_types/assigning_intersection_types.phpt b/Zend/tests/type_declarations/intersection_types/assigning_intersection_types.phpt
@@ -0,0 +1,57 @@
+--TEST--
+Assigning values to intersection types
+--FILE--
+<?php
+
+interface X {}
+interface Y {}
+interface Z {}
+
+class TestParent implements X, Y {}
+class TestChild  extends TestParent implements Z {}
+
+class A {
+
+    public X&Y&Z $prop;
+
+    public function method1(X&Y $a): X&Y&Z {
+        return new TestChild();
+    }
+    public function method2(X $a): X&Y {
+        return new TestParent();
+    }
+}
+
+$tp = new TestParent();
+$tc = new TestChild();
+
+$o = new A();
+try {
+    $o->prop = $tp;
+} catch (TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+
+$o->prop = $tc;
+
+$r = $o->method1($tp);
+var_dump($r);
+$r = $o->method2($tp);
+var_dump($r);
+$r = $o->method1($tc);
+var_dump($r);
+$r = $o->method2($tc);
+var_dump($r);
+
+
+?>
+--EXPECTF--
+Cannot assign TestParent to property A::$prop of type X&Y&Z
+object(TestChild)#%d (0) {
+}
+object(TestParent)#%d (0) {
+}
+object(TestChild)#%d (0) {
+}
+object(TestParent)#%d (0) {
+}
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_array_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_array_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+array type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): array&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type array cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_bool_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_bool_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+bool type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): bool&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type bool cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_callable_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_callable_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+callable type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): callable&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type callable cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_false_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_false_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+false type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): false&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type false cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_float_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_float_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+float type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): float&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type float cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_int_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_int_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+int type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): int&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type int cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_iterable_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_iterable_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+iterable type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): iterable&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type iterable cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_mixed_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_mixed_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+mixed type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): mixed&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type mixed cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_never_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_never_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+never type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): never&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type never cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_null_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_null_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+null type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): null&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type null cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_nullable_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_nullable_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Intersection type cannot be nullable
+--FILE--
+<?php
+
+function foo(): ?Countable&Iterator {}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "&", expecting "{" in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_object_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_object_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+object type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): object&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type object cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_parent_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_parent_type.phpt
@@ -0,0 +1,14 @@
+--TEST--
+parent type cannot take part in an intersection type
+--FILE--
+<?php
+
+class A {}
+
+class B extends A {
+    public function foo(): parent&Iterator {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Type parent cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_self_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_self_type.phpt
@@ -0,0 +1,12 @@
+--TEST--
+self type cannot take part in an intersection type
+--FILE--
+<?php
+
+class A {
+    public function foo(): self&Iterator {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Type self cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_static_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_static_type.phpt
@@ -0,0 +1,12 @@
+--TEST--
+static type cannot take part in an intersection type
+--FILE--
+<?php
+
+class A {
+    public function foo(): static&Iterator {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Type static cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_string_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_string_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+string type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): string&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type string cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_void_type.phpt b/Zend/tests/type_declarations/intersection_types/invalid_types/invalid_void_type.phpt
@@ -0,0 +1,10 @@
+--TEST--
+void type cannot take part in an intersection type
+--FILE--
+<?php
+
+function foo(): void&Iterator {}
+
+?>
+--EXPECTF--
+Fatal error: Type void cannot be part of an intersection type in %s on line %d