Improve

Author: VincentLanglet

src/Reflection/ParametersAcceptorSelector.php

@@ -517,33 +517,23 @@ public static function selectFromArgs(
 			if ($originalArg->unpack) {
 				$unpack = true;
 				$constantArrays = $type->getConstantArrays();
-				$expanded = false;
 				if (count($constantArrays) > 0) {
-					$allStringKeys = true;
 					foreach ($constantArrays as $constantArray) {
-						foreach ($constantArray->getKeyTypes() as $keyType) {
-							if (!$keyType->isString()->yes()) {
-								$allStringKeys = false;
-								break 2;
-							}
-						}
-					}
-					if ($allStringKeys) {
-						foreach ($constantArrays as $constantArray) {
-							foreach ($constantArray->getKeyTypes() as $j => $keyType) {
-								$keyName = $keyType->getValue();
-								if (!isset($types[$keyName])) {
-									$types[$keyName] = $constantArray->getValueTypes()[$j];
-								} else {
-									$types[$keyName] = TypeCombinator::union($types[$keyName], $constantArray->getValueTypes()[$j]);
-								}
+						foreach ($constantArray->getKeyTypes() as $j => $keyType) {
+							$valueType = $constantArray->getValueTypes()[$j];
+							$valueIndex = $keyType->getValue();
+							if (is_string($valueIndex)) {
+								$hasName = true;
+							} else {
+								$valueIndex = $i + $j;
 							}
+
+							$types[$valueIndex] = isset($types[$valueIndex])
+								? TypeCombinator::union($types[$valueIndex], $valueType)
+								: $valueType;
 						}
-						$hasName = true;
-						$expanded = true;
 					}
-				}
-				if (!$expanded) {
+				} else {
 					$types[$index] = $type->getIterableValueType();
 				}
 			} else {

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

@@ -20,3 +20,33 @@ public function __construct(
 }
 
 $a = new A(...['x' => 5, 'y' => 'b']);
+
+$aa = new A(...[5, 'y' => 'b']);
+
+$aaa = new A(...[5, 'b']);
+
+$aaaa = new A(...[1 => 5, 2 => 'b']);
+
+/**
+ * @template Y of 'a'|'b'
+ */
+class B
+{
+	/**
+	 * @param Y $y
+	 */
+	public function __construct(
+		public readonly int $init,
+		public readonly int $x,
+		public readonly string $y = 'a',
+	) {
+	}
+}
+
+$a = new B(1, ...['x' => 5, 'y' => 'b']);
+
+$aa = new B(1, ...[5, 'y' => 'b']);
+
+$aaa = new B(1, ...[5, 'b']);
+
+$aaaa = new B(1, ...[1 => 5, 2 => 'b']);