Merge array types a bit later

phpstan · Oct 6, 2023 · adbc35a · adbc35a
1 parent 746de74
commit adbc35a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -210,12 +210,7 @@ public static function union(Type ...$types): Type
 			$scalarTypes[$classType] = array_values($scalarTypeItems);
 		}
 
-		$types = array_values(
-			array_merge(
-				$types,
-				self::processArrayTypes($arrayTypes),
-			),
-		);
+		$types = array_values($types);
 		$typesCount = count($types);
 
 		foreach ($scalarTypes as $classType => $scalarTypeItems) {
@@ -263,9 +258,14 @@ public static function union(Type ...$types): Type
 				$newTypes[$type->describe(VerbosityLevel::cache())] = $type;
 			}
 			$types = array_values($newTypes);
-			$typesCount = count($types);
 		}
 
+		$types = array_merge(
+			$types,
+			self::processArrayTypes($arrayTypes),
+		);
+		$typesCount = count($types);
+
 		// transform A | A to A
 		// transform A | never to A
 		for ($i = 0; $i < $typesCount; $i++) {