adjust test expectations

Author: staabm

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

@@ -40,7 +40,7 @@ function getItemsByModifiedIndex(array $items): array
 function testKeepListAfterIssetIndex(array $list, int $i): void
 {
 	if (isset($list[$i])) {
-		assertType('list<int>', $list);
+		assertType('non-empty-list<int>', $list);
 		$list[$i] = 21;
 		assertType('non-empty-list<int>', $list);
 		$list[$i+1] = 21;
@@ -53,8 +53,8 @@ function testKeepListAfterIssetIndex(array $list, int $i): void
 function testKeepNestedListAfterIssetIndex(array $nestedList, int $i, int $j): void
 {
 	if (isset($nestedList[$i][$j])) {
-		assertType('list<list<int>>', $nestedList);
-		assertType('list<int>', $nestedList[$i]);
+		assertType('non-empty-list<list<int>>', $nestedList);
+		assertType('non-empty-list<int>', $nestedList[$i]);
 		$nestedList[$i][$j] = 21;
 		assertType('non-empty-list<list<int>>', $nestedList);
 		assertType('list<int>', $nestedList[$i]);
@@ -66,7 +66,7 @@ function testKeepNestedListAfterIssetIndex(array $nestedList, int $i, int $j): v
 function testKeepListAfterIssetIndexPlusOne(array $list, int $i): void
 {
 	if (isset($list[$i])) {
-		assertType('list<int>', $list);
+		assertType('non-empty-list<int>', $list);
 		$list[$i+1] = 21;
 		assertType('non-empty-list<int>', $list);
 	}
@@ -77,7 +77,7 @@ function testKeepListAfterIssetIndexPlusOne(array $list, int $i): void
 function testKeepListAfterIssetIndexOnePlus(array $list, int $i): void
 {
 	if (isset($list[$i])) {
-		assertType('list<int>', $list);
+		assertType('non-empty-list<int>', $list);
 		$list[1+$i] = 21;
 		assertType('non-empty-list<int>', $list);
 	}
@@ -90,7 +90,7 @@ function testShouldLooseListbyAst(array $list, int $i): void
 	if (isset($list[$i])) {
 		$i++;
 
-		assertType('list<int>', $list);
+		assertType('non-empty-list<int>', $list);
 		$list[1+$i] = 21;
 		assertType('non-empty-array<int<0, max>, int>', $list);
 	}
@@ -101,7 +101,7 @@ function testShouldLooseListbyAst(array $list, int $i): void
 function testShouldLooseListbyAst2(array $list, int $i): void
 {
 	if (isset($list[$i])) {
-		assertType('list<int>', $list);
+		assertType('non-empty-list<int>', $list);
 		$list[2+$i] = 21;
 		assertType('non-empty-array<int<0, max>, int>', $list);
 	}

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

@@ -12,7 +12,7 @@ public function doBar(): void
 		$composer = array();
 		foreach (array('require', 'require-dev') as $linkType) {
 			if (isset($composer[$linkType])) {
-				assertType('array{require?: array<string, string>, require-dev?: array<string, string>}', $composer);
+				assertType('non-empty-array{require?: array<string, string>, require-dev?: array<string, string>}', $composer);
 				foreach ($composer[$linkType] as $x) {}
 			}
 		}

tests/PHPStan/Analyser/nsrt/has-offset-type-bug.php

@@ -26,7 +26,7 @@ public function doFoo(array $errorMessages): void
 				continue;
 			}
 
-			assertType('array<string, int<1, max>>', $fileErrorsCounts);
+			assertType('non-empty-array<string, int<1, max>>', $fileErrorsCounts);
 			assertType('int<1, max>', $fileErrorsCounts[$errorMessage]);
 
 			$fileErrorsCounts[$errorMessage]++;

tests/PHPStan/Analyser/nsrt/specified-types-closure-use.php

@@ -48,10 +48,10 @@ function ($arr) use ($key): void {
 	public function doBuzz(array $arr, string $key): void
 	{
 		if (isset($arr[$key])) {
-			assertType('array', $arr);
+			assertType('non-empty-array', $arr);
 			assertType("mixed~null", $arr[$key]);
 			function () use ($arr, $key): void {
-				assertType('array', $arr);
+				assertType('non-empty-array', $arr);
 				assertType("mixed~null", $arr[$key]);
 			};
 		}
@@ -60,10 +60,10 @@ function () use ($arr, $key): void {
 	public function doBuzz(array $arr, string $key): void
 	{
 		if (isset($arr[$key])) {
-			assertType('array', $arr);
+			assertType('non-empty-array', $arr);
 			assertType("mixed~null", $arr[$key]);
 			function ($key) use ($arr): void {
-				assertType('array', $arr);
+				assertType('non-empty-array', $arr);
 				assertType("mixed", $arr[$key]);
 			};
 		}

tests/PHPStan/Rules/Arrays/data/bug-11679.php

@@ -33,7 +33,7 @@ public function sayHello(int $index): bool
 			$this->arr[$index]['foo'] = true;
 			assertType('non-empty-array<int, array{foo: true}>', $this->arr);
 		}
-		assertType('array<int, array{foo?: bool}>', $this->arr);
+		assertType('non-empty-array<int, array{foo?: bool}>', $this->arr);
 		return $this->arr[$index]['foo']; // PHPStan does not realize 'foo' is set
 	}
 }

tests/PHPStan/Rules/Variables/IssetRuleTest.php

@@ -498,7 +498,7 @@ public function testPr4374(): void
 
 		$this->analyse([__DIR__ . '/data/pr-4374.php'], [
 			[
-				'Offset string on array<PR4374\Foo> in isset() always exists and is not nullable.',
+				'Offset string on non-empty-array<PR4374\Foo> in isset() always exists and is not nullable.',
 				23,
 			],
 		]);