Remove shim for iterable BC

Author: Girgias

Zend/zend_compile.c

@@ -1189,8 +1189,6 @@ static zend_string *resolve_class_name(zend_string *name, zend_class_entry *scop
 
 zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scope) {
 	zend_string *str = NULL;
-	uint32_t type_mask = ZEND_TYPE_PURE_MASK(type);
-	bool has_name = ZEND_TYPE_HAS_NAME(type);
 
 	if (ZEND_TYPE_HAS_LIST(type)) {
 		zend_type *list_type;
@@ -1201,10 +1199,12 @@ zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scop
 			str = add_type_string(str, resolved, is_intersection);
 			zend_string_release(resolved);
 		} ZEND_TYPE_LIST_FOREACH_END();
-	} else if (has_name) {
+	} else if (ZEND_TYPE_HAS_NAME(type)) {
 		str = resolve_class_name(ZEND_TYPE_NAME(type), scope);
 	}
 
+	uint32_t type_mask = ZEND_TYPE_PURE_MASK(type);
+
 	if (type_mask == MAY_BE_ANY) {
 		str = add_type_string(str, ZSTR_KNOWN(ZEND_STR_MIXED), /* is_intersection */ false);
 

ext/reflection/php_reflection.c

@@ -1320,7 +1320,7 @@ typedef enum {
 } reflection_type_kind;
 
 /* For backwards compatibility reasons, we need to return T|null style unions
- * and transformation from iterable to Traversable|array
+ * ~~and transformation from iterable to Traversable|array~~
  * as a ReflectionNamedType. Here we determine what counts as a union type and
  * what doesn't. */
 static reflection_type_kind get_type_kind(zend_type type) {
@@ -1336,9 +1336,11 @@ static reflection_type_kind get_type_kind(zend_type type) {
 
 	if (ZEND_TYPE_IS_COMPLEX(type)) {
 		/* BC support for 'iterable' type */
+		/*
 		if (UNEXPECTED(ZEND_TYPE_IS_ITERABLE_FALLBACK(type))) {
 			return NAMED_TYPE;
 		}
+		*/
 		if (type_mask_without_null != 0) {
 			return UNION_TYPE;
 		}

ext/reflection/tests/iterable_Reflection.phpt

@@ -3,31 +3,33 @@ iterable Type in Reflection
 --FILE--
 <?php
 
-$functions = [
-    function(): iterable {},
-];
+$function = function(): iterable {};
 
-foreach ($functions as $function) {
-    $reflectionFunc = new ReflectionFunction($function);
-    $returnType = $reflectionFunc->getReturnType();
-    var_dump($returnType->getName());
+$reflectionFunc = new ReflectionFunction($function);
+$returnType = $reflectionFunc->getReturnType();
+var_dump($returnType::class);
+foreach ($returnType->getTypes() as $type) {
+    var_dump($type->getName());
 }
 
-
 class PropIterableTypeTest {
     public iterable $iterable;
 }
 
 $reflector = new ReflectionClass(PropIterableTypeTest::class);
 
-foreach ($reflector->getProperties() as $name => $property) {
-    if ($property->hasType()) {
-        printf("public %s $%s;\n",
-            $property->getType()->getName(), $property->getName());
-    } else printf("public $%s;\n", $property->getName());
+[$property] = $reflector->getProperties();
+$iterableType = $property->getType();
+var_dump($iterableType::class);
+foreach ($iterableType->getTypes() as $type) {
+    var_dump($type->getName());
 }
 
 ?>
 --EXPECT--
-string(17) "Traversable|array"
-public Traversable|array $iterable;
+string(19) "ReflectionUnionType"
+string(11) "Traversable"
+string(5) "array"
+string(19) "ReflectionUnionType"
+string(11) "Traversable"
+string(5) "array"