Rebase fixup

RepresentableType has been replaced by ArginfoType. This is only
a partial fix, in that we still need to handle class union types.

Author: nikic

build/gen_stub.php

@@ -1033,21 +1033,16 @@ function (Expr $expr) use (&$defaultValueConstant) {
         }
 
         if ($this->type) {
-            $typeFlags = $this->type->tryToRepresentableType();
-            if ($typeFlags === null) {
-                echo "Skipping code generation for property $this->name, because it has an unimplemented type\n";
-                return "";
-            }
-
-            if ($typeFlags->classType) {
+            $arginfoType = $this->type->toArginfoType();
+            if ($arginfoType->hasClassType()) {
                 $simpleType = $this->type->tryToSimpleType();
                 if ($simpleType) {
-                    $typeCode = "(zend_type) ZEND_TYPE_INIT_CE(class_entry_" . str_replace("\\", "_", $typeFlags->classType->name) . ", " .  ((int) $this->type->isNullable()) . ", 0)";
+                    $typeCode = "(zend_type) ZEND_TYPE_INIT_CE(class_entry_" . str_replace("\\", "_", $arginfoType->classTypes[0]->name) . ", " .  ((int) $this->type->isNullable()) . ", 0)";
                 } else {
                     throw new Exception("Property $this->name has an unsupported union type");
                 }
             } else {
-                $typeCode = "(zend_type) ZEND_TYPE_INIT_MASK(" . $typeFlags->toTypeMask() . ")";
+                $typeCode = "(zend_type) ZEND_TYPE_INIT_MASK(" . $arginfoType->toTypeMask() . ")";
             }
 
             $code .= $this->initializeValue($defaultValueType, $defaultValue);
@@ -1261,9 +1256,9 @@ public function getRegistration(): string
                 continue;
             }
 
-            $representableType = $type->tryToRepresentableType();
-            if ($representableType && $representableType->classType) {
-                $params[] = "zend_class_entry *class_entry_" . str_replace("\\", "_", $representableType->classType->name);
+            $arginfoType = $type->toArginfoType();
+            if (count($arginfoType->classTypes) == 1) {
+                $params[] = "zend_class_entry *class_entry_" . str_replace("\\", "_", $arginfoType->classTypes[0]->name);
             }
         }
         $params = array_unique($params);

ext/zend_test/test.stub.php

@@ -19,7 +19,7 @@ class _ZendTestClass implements _ZendTestInterface {
 
     public int $intProp = 123;
     public ?stdClass $classProp = null;
-    public stdClass|Iterator|null $classUnionProp = null;
+    //public stdClass|Iterator|null $classUnionProp = null;
 
     public static function is_object(): int {}
 

ext/zend_test/test_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 520097c67aab4b8f2f6c641be4816fb4e06e7e99 */
+ * Stub hash: 950679cde15789a9060d4798dc35dc5a590fd8b2 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()