Add support for stubs to declare intersection type class properties

Author: Girgias

Zend/zend_types.h

@@ -280,6 +280,9 @@ typedef struct {
 #define ZEND_TYPE_INIT_UNION(ptr, extra_flags) \
 	{ (void *) (ptr), (_ZEND_TYPE_LIST_BIT|_ZEND_TYPE_UNION_BIT) | (extra_flags) }
 
+#define ZEND_TYPE_INIT_INTERSECTION(ptr, extra_flags) \
+	{ (void *) (ptr), (_ZEND_TYPE_LIST_BIT|_ZEND_TYPE_INTERSECTION_BIT) | (extra_flags) }
+
 #define ZEND_TYPE_INIT_CLASS(class_name, allow_null, extra_flags) \
 	ZEND_TYPE_INIT_PTR(class_name, _ZEND_TYPE_NAME_BIT, allow_null, extra_flags)
 

build/gen_stub.php

@@ -513,6 +513,14 @@ public static function fromNode(Node $node): Type {
             }
             return new Type($types);
         }
+        if ($node instanceof Node\IntersectionType) {
+            $nestedTypeObjects = array_map(['Type', 'fromNode'], $node->types);
+            $types = [];
+            foreach ($nestedTypeObjects as $typeObject) {
+                array_push($types, ...$typeObject->types);
+            }
+            return new Type($types, true);
+        }
 
         if ($node instanceof Node\NullableType) {
             return new Type(
@@ -574,7 +582,7 @@ public static function fromString(string $typeString): self {
     /**
      * @param SimpleType[] $types
      */
-    private function __construct(array $types) {
+    private function __construct(array $types, public readonly bool $isIntersection = false) {
         $this->types = $types;
     }
 
@@ -2136,7 +2144,11 @@ public function getDeclaration(iterable $allConstInfos): string {
 
                     $typeMaskCode = $this->type->toArginfoType()->toTypeMask();
 
-                    $code .= "\tzend_type property_{$propertyName}_type = ZEND_TYPE_INIT_UNION(property_{$propertyName}_type_list, $typeMaskCode);\n";
+                    if ($this->type->isIntersection) {
+                        $code .= "\tzend_type property_{$propertyName}_type = ZEND_TYPE_INIT_INTERSECTION(property_{$propertyName}_type_list, $typeMaskCode);\n";
+                    } else {
+                        $code .= "\tzend_type property_{$propertyName}_type = ZEND_TYPE_INIT_UNION(property_{$propertyName}_type_list, $typeMaskCode);\n";
+                    }
                     $typeCode = "property_{$propertyName}_type";
                 } else {
                     $escapedClassName = $arginfoType->classTypes[0]->toEscapedName();

ext/zend_test/test.stub.php

@@ -17,6 +17,7 @@ class _ZendTestClass implements _ZendTestInterface {
         public int $intProp = 123;
         public ?stdClass $classProp = null;
         public stdClass|Iterator|null $classUnionProp = null;
+        public Traversable&Countable $classIntersectionProp;
         public readonly int $readonlyProp;
 
         public static function is_object(): int {}

ext/zend_test/test_arginfo.h

@@ -0,0 +1,46 @@
+--TEST--
+Test that internal classes can register intersection types
+--EXTENSIONS--
+zend_test
+spl
+--FILE--
+<?php
+
+class C implements Countable {
+    public function count(): int {
+        return 1;
+    }
+}
+
+class I extends EmptyIterator implements Countable {
+    public function count(): int {
+        return 1;
+    }
+}
+
+$o = new _ZendTestClass();
+
+try {
+    var_dump($o->classIntersectionProp);
+} catch (Error $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o->classIntersectionProp = new EmptyIterator();
+} catch (TypeError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+try {
+    $o->classIntersectionProp = new C();
+} catch (TypeError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+$o->classIntersectionProp = new I();
+
+?>
+==DONE==
+--EXPECT--
+Error: Typed property _ZendTestClass::$classIntersectionProp must not be accessed before initialization
+Cannot assign EmptyIterator to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
+Cannot assign C to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
+==DONE==