Array map on multiple elements is a list

Author: VincentLanglet

src/Type/Php/ArrayMapFunctionReturnTypeExtension.php

@@ -168,10 +168,12 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 				);
 			}
 		} else {
-			$mappedArrayType = TypeCombinator::intersect(new ArrayType(
-				new IntegerType(),
-				$valueType,
-			), ...TypeUtils::getAccessoryTypes($arrayType));
+			$mappedArrayType = AccessoryArrayListType::intersectWith(
+				TypeCombinator::intersect(new ArrayType(
+					new IntegerType(),
+					$valueType,
+				), ...TypeUtils::getAccessoryTypes($arrayType)),
+			);
 		}
 
 		if ($arrayType->isIterableAtLeastOnce()->yes()) {

tests/PHPStan/Analyser/nsrt/array_map_multiple.php

@@ -15,7 +15,7 @@ public function doFoo(int $i, string $s): void
 
 			return rand(0, 1) ? $a : $b;
 		}, ['foo' => $i], ['bar' => $s]);
-		assertType('non-empty-array<int, int|string>', $result);
+		assertType('non-empty-list<int|string>', $result);
 	}
 
 	/**
@@ -26,12 +26,12 @@ public function arrayMapNull(array $array, array $other): void
 	{
 		assertType('array{}', array_map(null, []));
 		assertType('array{foo: true}', array_map(null, ['foo' => true]));
-		assertType('non-empty-array<int, array{1|2|3, 4|5|6}>', array_map(null, [1, 2, 3], [4, 5, 6]));
+		assertType('non-empty-list<array{1|2|3, 4|5|6}>', array_map(null, [1, 2, 3], [4, 5, 6]));
 
 		assertType('non-empty-array<string, int>', array_map(null, $array));
-		assertType('non-empty-array<int, array{int, int}>', array_map(null, $array, $array));
-		assertType('non-empty-array<int, array{int, int, int}>', array_map(null, $array, $array, $array));
-		assertType('non-empty-array<int, array{int|null, bool|null}>', array_map(null, $array, $other));
+		assertType('non-empty-list<array{int, int}>', array_map(null, $array, $array));
+		assertType('non-empty-list<array{int, int, int}>', array_map(null, $array, $array, $array));
+		assertType('non-empty-list<array{int|null, bool|null}>', array_map(null, $array, $other));
 
 		assertType('array{1}|array{true}', array_map(null, rand() ? [1] : [true]));
 		assertType('array{1}|array{true, false}', array_map(null, rand() ? [1] : [true, false]));

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1064,4 +1064,9 @@ public function testBug11857(): void
 		$this->analyse([__DIR__ . '/data/bug-11857-builder.php'], []);
 	}
 
+	public function testBug12223(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-12223.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-12223.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug12223;
+
+class HelloWorld
+{
+	/**
+	 * @return list<string>
+	 */
+	public function sayHello(): array
+	{
+		$a = [1 => 'foo', 3 => 'bar', 5 => 'baz'];
+		return array_map(static fn(string $s, int $i): string => $s . $i, $a, array_keys($a));
+	}
+}