IT WORKS

Girgias · Girgias · commit f28307c8c9b9 · 2021-04-09T02:31:55.000+01:00
Currently crappy boolean value to make sure first single class type doesn't use the void* to store the CE
diff --git a/Zend/tests/type_declarations/composite_types/intersection_and_union_type_combined.phpt b/Zend/tests/type_declarations/composite_types/intersection_and_union_type_combined.phpt
@@ -8,6 +8,7 @@ interface Y {}
 
 class A implements X, Y {}
 class B {}
+class C {}
 
 class Test {
     public X&Y|int $prop1;
@@ -50,13 +51,77 @@ $test->prop2 = $i;
 $test->bar1($a);
 $test->bar2($a);
 $test->bar1($b);
-$test->bar2($b); // This currently fails
+$test->bar2($b);
 $test->prop3 = $a;
 $test->prop4 = $b;
 $test->prop3 = $a;
 $test->prop4 = $b;
 
+$c = new C();
+try {
+    $test->foo1($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->foo2($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->bar1($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->bar2($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->prop1 = $c;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->prop2 = $c;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->prop3 = $c;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    $test->prop4 = $c;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+object(A)#2 (0) {
+}
+object(A)#2 (0) {
+}
+int(10)
+int(10)
+object(A)#2 (0) {
+}
+object(A)#2 (0) {
+}
+object(B)#3 (0) {
+}
+object(B)#3 (0) {
+}
+Test::foo1(): Argument #1 ($v) must be of type X&Y|int, C given, called in %s on line %d
+Test::foo2(): Argument #1 ($v) must be of type X&Y|int, C given, called in %s on line %d
+Test::bar1(): Argument #1 ($v) must be of type B|X&Y, C given, called in %s on line %d
+Test::bar2(): Argument #1 ($v) must be of type X&Y|B, C given, called in %s on line %d
+Cannot assign C to property Test::$prop1 of type X&Y|int
+Cannot assign C to property Test::$prop2 of type X&Y|int
+Cannot assign C to property Test::$prop3 of type X&Y|B
+Cannot assign C to property Test::$prop4 of type B|X&Y
 ===DONE===
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6276,6 +6276,7 @@ static zend_type zend_compile_typename(
 	if (ast->kind == ZEND_AST_TYPE_UNION) {
 		zend_ast_list *list = zend_ast_get_list(ast);
 		zend_type_list *type_list;
+		bool is_composite = false;
 		ALLOCA_FLAG(use_heap)
 
 		type_list = do_alloca(ZEND_TYPE_LIST_SIZE(list->children), use_heap);
@@ -6287,6 +6288,7 @@ static zend_type zend_compile_typename(
 			uint32_t single_type_mask;
 
 			if (type_ast->kind == ZEND_AST_TYPE_INTERSECTION) {
+				is_composite = true;
 				/* The first class type can be stored directly as the type ptr payload. */
 				if (ZEND_TYPE_IS_COMPLEX(type) && !ZEND_TYPE_HAS_LIST(type)) {
 					/* Switch from single name to name list. */
@@ -6324,7 +6326,7 @@ static zend_type zend_compile_typename(
 			ZEND_TYPE_FULL_MASK(single_type) &= ~_ZEND_TYPE_MAY_BE_MASK;
 
 			if (ZEND_TYPE_IS_COMPLEX(single_type)) {
-				if (!ZEND_TYPE_IS_COMPLEX(type)) {
+				if (!ZEND_TYPE_IS_COMPLEX(type) && !is_composite) {
 					/* The first class type can be stored directly as the type ptr payload. */
 					ZEND_TYPE_SET_PTR(type, ZEND_TYPE_NAME(single_type));
 					ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_NAME_BIT;
