Use TypeUtils::getOldConstantArrays in array_map extension

Author: herndlm

src/Type/Php/ArrayMapFunctionReturnTypeExtension.php

@@ -63,15 +63,16 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			if ($callableIsNull) {
 				return $arrayType;
 			}
-			$constantArrays = TypeUtils::getConstantArrays($arrayType);
+			$constantArrays = TypeUtils::getOldConstantArrays($arrayType);
 			if (count($constantArrays) > 0) {
 				$arrayTypes = [];
 				foreach ($constantArrays as $constantArray) {
 					$returnedArrayBuilder = ConstantArrayTypeBuilder::createEmpty();
-					foreach ($constantArray->getKeyTypes() as $keyType) {
+					foreach ($constantArray->getKeyTypes() as $i => $keyType) {
 						$returnedArrayBuilder->setOffsetValueType(
 							$keyType,
 							$valueType,
+							$constantArray->isOptionalKey($i),
 						);
 					}
 					$arrayTypes[] = $returnedArrayBuilder->getArray();

tests/PHPStan/Analyser/data/array-map.php

@@ -60,3 +60,15 @@ static function(string $string): string {
 
 	assertType('non-empty-array<int, string>', $mapped);
 }
+
+/** @param array{foo?: 0, bar?: 1, baz?: 2} $array */
+function foo5(array $array): void {
+	$mapped = array_map(
+		static function(string $string): string {
+			return (string) $string;
+		},
+		$array
+	);
+
+	assertType('array{foo?: string, bar?: string, baz?: string}', $mapped);
+}