Fix tests

Author: ondrejmirtes

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -4264,7 +4264,7 @@ public function dataAnonymousFunction(): array
 				'$str',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'list<mixed>' : 'array<int|string, mixed>',
+				PHP_VERSION_ID < 80000 ? 'list' : 'array<int|string, mixed>',
 				'$arr',
 			],
 			[

tests/PHPStan/Analyser/nsrt/array-column.php

@@ -189,7 +189,7 @@ public function testImprecise5(array $array): void
 		assertType('list<string>', array_column($array, 'nodeName'));
 		assertType('array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('list', array_column($array, 'foo'));
 		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
 		assertType('array<int|string, string>', array_column($array, 'nodeName', 'foo'));
 		assertType('array<int|string, DOMElement>', array_column($array, null, 'foo'));
@@ -201,7 +201,7 @@ public function testObjects1(array $array): void
 		assertType('non-empty-list<string>', array_column($array, 'nodeName'));
 		assertType('non-empty-array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('list', array_column($array, 'foo'));
 		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
 		assertType('non-empty-array<int|string, string>', array_column($array, 'nodeName', 'foo'));
 		assertType('non-empty-array<int|string, DOMElement>', array_column($array, null, 'foo'));
@@ -213,7 +213,7 @@ public function testObjects2(array $array): void
 		assertType('array{string}', array_column($array, 'nodeName'));
 		assertType('non-empty-array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('list', array_column($array, 'foo'));
 		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
 		assertType('non-empty-array<int|string, string>', array_column($array, 'nodeName', 'foo'));
 		assertType('non-empty-array<int|string, DOMElement>', array_column($array, null, 'foo'));
@@ -227,7 +227,7 @@ final class Foo
 	/** @param array<int, self> $a */
 	public function doFoo(array $a): void
 	{
-		assertType('list<mixed>', array_column($a, 'nodeName'));
+		assertType('list', array_column($a, 'nodeName'));
 		assertType('array<int|string, mixed>', array_column($a, 'nodeName', 'tagName'));
 	}
 

tests/PHPStan/Analyser/nsrt/array-fill-keys-php7.php

@@ -7,7 +7,7 @@
 function mixedAndSubtractedArray($mixed): void
 {
 	if (is_array($mixed)) {
-		assertType("array<'b'>", array_fill_keys($mixed, 'b'));
+		assertType("array<mixed, 'b'>", array_fill_keys($mixed, 'b'));
 	} else {
 		assertType("null", array_fill_keys($mixed, 'b'));
 	}

tests/PHPStan/Analyser/nsrt/array-flip-php7.php

@@ -9,7 +9,7 @@ function mixedAndSubtractedArray($mixed)
 	if (is_array($mixed)) {
 		assertType('array<int|string, (int|string)>', array_flip($mixed));
 	} else {
-		assertType('mixed~array', $mixed);
+		assertType('mixed~array<mixed, mixed>', $mixed);
 		assertType('null', array_flip($mixed));
 	}
 }

tests/PHPStan/Analyser/nsrt/array-intersect-key-php7.php

@@ -16,7 +16,7 @@ public function mixedAndSubtractedArray($mixed, array $otherArrs): void
 			/** @var array<string, int> $otherArrs */
 			assertType('array<string, mixed>', array_intersect_key($mixed, $otherArrs));
 		} else {
-			assertType('mixed~array', $mixed);
+			assertType('mixed~array<mixed, mixed>', $mixed);
 			/** @var array<int, string> $otherArrs */
 			assertType('null', array_intersect_key($mixed, $otherArrs));
 			/** @var array<string, int> $otherArrs */

tests/PHPStan/Analyser/nsrt/array-search-php7.php

@@ -16,7 +16,7 @@ public function mixedAndSubtractedArray($mixed, string $string): void
 			assertType('int|string|false', array_search('foo', $mixed));
 			assertType('int|string|false', array_search($string, $mixed, true));
 		} else {
-			assertType('mixed~array', $mixed);
+			assertType('mixed~array<mixed, mixed>', $mixed);
 			assertType('null', array_search('foo', $mixed, true));
 			assertType('null', array_search('foo', $mixed));
 			assertType('null', array_search($string, $mixed, true));

tests/PHPStan/Analyser/nsrt/array_keys-php7.php

@@ -12,7 +12,7 @@ public function sayHello($mixed): void
 		if (is_array($mixed)) {
 			assertType('list<(int|string)>', array_keys($mixed));
 		} else {
-			assertType('mixed~array', $mixed);
+			assertType('mixed~array<mixed, mixed>', $mixed);
 			assertType('null', array_keys($mixed));
 		}
 	}

tests/PHPStan/Analyser/nsrt/array_values-php7.php

@@ -12,7 +12,7 @@ public function foo1($mixed): void
 		if (is_array($mixed)) {
 			assertType('list<mixed>', array_values($mixed));
 		} else {
-			assertType('mixed~array', $mixed);
+			assertType('mixed~array<mixed, mixed>', $mixed);
 			assertType('null', array_values($mixed));
 		}
 	}