refactor

Author: staabm

src/Type/Php/ArrayMergeFunctionDynamicReturnTypeExtension.php

@@ -26,7 +26,6 @@
 use function count;
 use function in_array;
 use function is_int;
-use function is_string;
 
 #[AutowiredService]
 final class ArrayMergeFunctionDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
@@ -100,26 +99,25 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			}
 
 			if ($keyTypes === []) {
-				foreach ($offsetTypes as [&$generalize, $offsetType]) {
-					$generalize = true;
+				foreach ($offsetTypes as $key => [$generalize, $offsetValueType]) {
+					$offsetTypes[$key][0] = true;
 				}
-				unset($generalize);
 			}
 
-			if ($newArrayBuilder === null) {
-				foreach (TypeUtils::getAccessoryTypes($argType) as $accessoryType) {
-					if (
-						!($accessoryType instanceof HasOffsetType)
-						&& !($accessoryType instanceof HasOffsetValueType)
-					) {
-						continue;
-					}
-
-					$offsetType = $accessoryType->getOffsetType();
-					$offsetValueType = $argType->getOffsetValueType($offsetType);
-					$offsetTypes[$offsetType->getValue()] = [false, $offsetValueType];
+			foreach (TypeUtils::getAccessoryTypes($argType) as $accessoryType) {
+				if (
+					!($accessoryType instanceof HasOffsetType)
+					&& !($accessoryType instanceof HasOffsetValueType)
+				) {
+					continue;
 				}
 
+				$offsetType = $accessoryType->getOffsetType();
+				$offsetValueType = $argType->getOffsetValueType($offsetType);
+				$offsetTypes[$offsetType->getValue()] = [false, $offsetValueType];
+			}
+
+			if ($newArrayBuilder === null) {
 				continue;
 			}
 
@@ -182,7 +180,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 				}
 				$keyType = new ConstantStringType($key);
 
-				if (!$generalize && is_string($key)) {
+				if (!$generalize) {
 					// the last string-keyed offset will overwrite previous values
 					$hasOffsetType = new HasOffsetValueType(
 						$keyType,

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

@@ -32,25 +32,29 @@ function doOptKeys(array $array, array $arr2): void {
 		$array['abc'] = 'def';
 	}
 	assertType("array", array_merge($arr2, $array));
+	assertType("array", array_merge($array, $arr2));
 }
 
 /**
  * @param array{a?: 1, b: 2} $array
  */
 function doOptShapeKeys(array $array, array $arr2): void {
 	assertType("non-empty-array&hasOffsetValue('b', 2)", array_merge($arr2, $array));
+	assertType("non-empty-array&hasOffset('b')", array_merge($array, $arr2));
 }
 
 function hasOffsetKeys(array $array, array $arr2): void {
 	if (array_key_exists('b', $array)) {
 		assertType("non-empty-array&hasOffsetValue('b', mixed)", array_merge($arr2, $array));
+		assertType("non-empty-array&hasOffset('b')", array_merge($array, $arr2));
 	}
 }
 
 function hasOffsetValueKeys(array $array, array $arr2): void {
 	$array['b'] = 123;
 
 	assertType("non-empty-array&hasOffsetValue('b', 123)", array_merge($arr2, $array));
+	assertType("non-empty-array&hasOffset('b')", array_merge($array, $arr2));
 }
 
 /**