support HasOffset* types

Author: staabm

src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php

@@ -9,6 +9,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\Accessory\HasOffsetType;
+use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -20,6 +21,7 @@
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeUtils;
 use function array_keys;
 use function count;
 use function in_array;
@@ -74,7 +76,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			static fn (Type $argType) => $argType->isConstantArray(),
 		);
 
-		$nonOptionalConstKeys = [];
+		$offsetTypes = [];
 		$newArrayBuilder = null;
 		if ($allConstant->yes()) {
 			$newArrayBuilder = ConstantArrayTypeBuilder::createEmpty();
@@ -90,11 +92,24 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 						continue;
 					}
 
-					$nonOptionalConstKeys[] = $keyType;
+					$offsetTypes[$keyType->getValue()] = new HasOffsetType($keyType);
 				}
 			}
 
 			if ($newArrayBuilder === null) {
+				foreach (TypeUtils::getAccessoryTypes($argType) as $accessoryType) {
+					if (
+						!($accessoryType instanceof HasOffsetType)
+						&& !($accessoryType instanceof HasOffsetValueType)
+					) {
+						continue;
+					}
+
+					$offsetType = $accessoryType->getOffsetType();
+					$offsetTypes[$offsetType->getValue()] = new HasOffsetType($offsetType);
+
+				}
+
 				continue;
 			}
 
@@ -136,11 +151,6 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return new ConstantArrayType([], []);
 		}
 
-		$offsetTypes = [];
-		foreach ($nonOptionalConstKeys as $constKey) {
-			$offsetTypes[] = new HasOffsetType($constKey);
-		}
-
 		$arrayType = new ArrayType(
 			$keyType,
 			TypeCombinator::union(...$valueTypes),

tests/PHPStan/Analyser/nsrt/array-merge-const-non-const.php

@@ -40,3 +40,15 @@ function doOptKeys(array $array, array $arr2): void {
 function doOptShapeKeys(array $array, array $arr2): void {
 	assertType("non-empty-array&hasOffset('b')", array_merge($arr2, $array));
 }
+
+function hasOffsetKeys(array $array, array $arr2): void {
+	if (array_key_exists('b', $array)) {
+		assertType("non-empty-array&hasOffset('b')", array_merge($arr2, $array));
+	}
+}
+
+function hasOffsetValueKeys(array $array, array $arr2): void {
+	$array['b'] = 123;
+
+	assertType("non-empty-array&hasOffset('b')", array_merge($arr2, $array));
+}