Fix array_map with accessory HasOffsetValueType

Author: ondrejmirtes

src/Type/Php/ArrayMapFunctionReturnTypeExtension.php

@@ -9,6 +9,8 @@
 use PHPStan\Node\Expr\TypeExpr;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryType;
+use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -149,13 +151,13 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 					$mappedArrayType = TypeCombinator::intersect(new ArrayType(
 						$arrayType->getIterableKeyType(),
 						$valueType,
-					), ...TypeUtils::getAccessoryTypes($arrayType));
+					), ...$this->getAccessoryTypes($arrayType, $valueType));
 				}
 			} elseif ($arrayType->isArray()->yes()) {
 				$mappedArrayType = TypeCombinator::intersect(new ArrayType(
 					$arrayType->getIterableKeyType(),
 					$valueType,
-				), ...TypeUtils::getAccessoryTypes($arrayType));
+				), ...$this->getAccessoryTypes($arrayType, $valueType));
 			} else {
 				$mappedArrayType = new ArrayType(
 					new MixedType(),
@@ -166,7 +168,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			$mappedArrayType = TypeCombinator::intersect(new ArrayType(
 				new IntegerType(),
 				$valueType,
-			), new AccessoryArrayListType(), ...TypeUtils::getAccessoryTypes($arrayType));
+			), new AccessoryArrayListType(), ...$this->getAccessoryTypes($arrayType, $valueType));
 		}
 
 		if ($arrayType->isIterableAtLeastOnce()->yes()) {
@@ -176,4 +178,22 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		return $mappedArrayType;
 	}
 
+	/**
+	 * @return AccessoryType[]
+	 */
+	private function getAccessoryTypes(Type $arrayType, Type $valueType): array
+	{
+		$accessoryTypes = [];
+		foreach (TypeUtils::getAccessoryTypes($arrayType) as $accessoryType) {
+			if (!$accessoryType instanceof HasOffsetValueType) {
+				$accessoryTypes[] = $accessoryType;
+				continue;
+			}
+
+			$accessoryTypes[] = new HasOffsetValueType($accessoryType->getOffsetType(), $valueType);
+		}
+
+		return $accessoryTypes;
+	}
+
 }

tests/PHPStan/Analyser/nsrt/discussion-13395.php

@@ -0,0 +1,86 @@
+<?php declare(strict_types = 1);
+
+namespace Discussion13395;
+
+use function PHPStan\Testing\assertType;
+
+final readonly class View
+{
+	public function __construct(
+		public string $value,
+	) {
+	}
+}
+
+class HelloWorld
+{
+	/**
+	 * @param non-empty-list<array{
+	 *     value: ?string,
+	 * }> $rows
+	 * @return non-empty-list<View>|null
+	 */
+	public function fetch(
+		array $rows,
+	) : ?array {
+		return $this->buildViews($rows);
+	}
+
+	/**
+	 * @param non-empty-list<array{
+	 *     value: ?string,
+	 * }> $rows
+	 * @return non-empty-list<View>|null
+	 */
+	private function buildViews(array $rows) : ?array
+	{
+		if ($rows[0]['value'] === null) {
+			return null;
+		}
+
+		$views = \array_map(
+			static function (array $row) : View {
+				\assert($row['value'] !== null);
+				return new View(
+					$row['value'],
+				);
+			},
+			$rows,
+		);
+
+		assertType('non-empty-list<Discussion13395\\View>&hasOffsetValue(0, Discussion13395\View)', $views); // could be just non-empty-list<Discussion13395\\View>
+
+		return $views;
+	}
+
+	/**
+	 * @param non-empty-list<array{
+	 *     value: ?string,
+	 * }> $rows
+	 * @return non-empty-list<View>|null
+	 */
+	private function buildViews2(array $rows) : ?array
+	{
+		if ($rows[0]['value'] === null) {
+			return null;
+		}
+
+		if ($rows[1]['value'] === null) {
+			return null;
+		}
+
+		$views = \array_map(
+			static function (array $row) : View {
+				\assert($row['value'] !== null);
+				return new View(
+					$row['value'],
+				);
+			},
+			$rows,
+		);
+
+		assertType('non-empty-list<Discussion13395\View>&hasOffsetValue(0, Discussion13395\View)&hasOffsetValue(1, Discussion13395\View)', $views); // could be just &hasOffsetValue(1, Discussion13395\View)
+
+		return $views;
+	}
+}