fix

Author: staabm

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

@@ -8,12 +8,12 @@
 foreach (toAdd() as $add) {
 	$changes[$add['id']]['add'][] = doSomething($add);
 }
-assertType('array<int, array{add: non-empty-array<int<0, max>, 1>}>', $changes);
+assertType('array<array{add: non-empty-list}>', $changes);
 
 foreach (toRem() as $del) {
 	$changes[$add['id']]['del'][] = doSomething($del);
 }
-assertType('array<int, array{add: non-empty-array<int<0, max>, 1>, del?: non-empty-array<int<0, max>, 2>}>', $changes);
+assertType('array<non-empty-array{add?: non-empty-list, del?: non-empty-list}>', $changes);
 
 foreach ($changes as $changeSet) {
 	if (isset($changeSet['del'])) {

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

@@ -57,11 +57,11 @@ function main()
 	]
 	*/
 
-	assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKey);
+	assertType("array<string, non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKey);
 	foreach ($arrDataByKey as $key => $arrDataByKeyForKey) {
-		assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKeyForKey);
+		assertType("non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}", $arrDataByKeyForKey);
 		echo [] === ($arrDataByKeyForKey['6M'] ?? []) ? 'No 6M data for key ' . $key . "\n" : 'We got 6M data for key ' . $key . "\n";
 		echo [] === ($arrDataByKeyForKey['3M'] ?? []) ? 'No 3M data for key ' . $key . "\n" : 'We got 3M data for key ' . $key . "\n";
-		assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKeyForKey);
+		assertType("non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}", $arrDataByKeyForKey);
 	}
 }

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

@@ -13,7 +13,7 @@ function (): void {
 			'value' => rand(),
 		];
 	}
-	assertType('list<array{test: false, value: int<0, max>}>', $list);
+	assertType('non-empty-list<array{test: false, value: int<0, max>}>', $list);
 
 	// TODO: sort list by value asc...
 	$k = array_key_first($list);
@@ -24,6 +24,6 @@ function (): void {
 			echo $item['value'];
 		}
 	}
-	assertType('array{test: true, value?: int<0, max>}', $list);
+	assertType('non-empty-list<array{test: bool, value: int<0, max>}>&hasOffsetValue(0, array{test: true, value: int<0, max>})', $list);
 
 };