another test

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -5771,9 +5771,10 @@ private function produceArrayDimFetchAssignValueToWrite(array $offsetTypes, Type
 			$offsetValueTypeStack[] = [$offsetValueType, $has];
 		}
 
-		foreach (array_reverse($offsetTypes) as $i => [$offsetType]) {
-			/** @var Type $offsetValueType */
-			[$offsetValueType, $has] = array_pop($offsetValueTypeStack);
+		foreach (array_reverse($offsetTypes) as [$offsetType]) {
+			/** @var array{Type, TrinaryLogic} $stackItem */
+			$stackItem = array_pop($offsetValueTypeStack);
+			[$offsetValueType, $has] = $stackItem;
 			if (
 				!$offsetValueType instanceof MixedType
 				&& !$offsetValueType->isConstantArray()->yes()

tests/PHPStan/Analyser/data/bug-10922.php

@@ -38,6 +38,6 @@ public function sayHello3(array $array): void
 		foreach ($array as $key => $item) {
 			$array[$key]['bar'] = '';
 		}
-		assertType("non-empty-array<string, array{foo: string, bar: ''}>", $array);
+		assertType("non-empty-array<string, array{foo: string, bar?: ''}>", $array);
 	}
 }

tests/PHPStan/Analyser/nsrt/bug-6173.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6173;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	/**
+	 * @param int[] $ids1
+	 * @param int[] $ids2
+	 */
+	public function sayHello(array $ids1, array $ids2): bool
+	{
+		$res = [];
+		foreach ($ids1 as $id) {
+			$res[$id]['foo'] = $id;
+		}
+
+		foreach ($ids2 as $id) {
+			$res[$id]['bar'] = $id;
+		}
+
+		assertType('array<int, non-empty-array{foo?: int, bar?: int}>', $res);
+
+		return true;
+	}
+}