MixedType::toArrayKey() returns BenevolentUnionType

Author: ondrejmirtes

src/Type/MixedType.php

@@ -600,7 +600,7 @@ public function toArray(): Type
 
 	public function toArrayKey(): Type
 	{
-		return new UnionType([new IntegerType(), new StringType()]);
+		return new BenevolentUnionType([new IntegerType(), new StringType()]);
 	}
 
 	public function isIterable(): TrinaryLogic

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -3328,7 +3328,7 @@ public function dataLiteralArraysKeys(): array
 				"'BooleansArray'",
 			],
 			[
-				'int|string',
+				'(int|string)',
 				"'UnknownConstantArray'",
 			],
 		];
@@ -9147,7 +9147,7 @@ public function dataGeneralizeScope(): array
 	{
 		return [
 			[
-				'array<string, non-empty-array<int|string, array{saveCount: int<0, max>, removeCount: int<0, max>, loadCount: int<0, max>, hitCount: int<0, max>}>>',
+				'array<string, non-empty-array<array{saveCount: int<0, max>, removeCount: int<0, max>, loadCount: int<0, max>, hitCount: int<0, max>}>>',
 				'$statistics',
 			],
 		];

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

@@ -177,8 +177,8 @@ public function testImprecise5(array $array): void
 		assertType('array<string, DOMElement>', array_column($array, null, 'tagName'));
 		assertType('list<mixed>', 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'));
+		assertType('array<string>', array_column($array, 'nodeName', 'foo'));
+		assertType('array<DOMElement>', array_column($array, null, 'foo'));
 	}
 
 	/** @param non-empty-array<int, DOMElement> $array */
@@ -189,8 +189,8 @@ public function testObjects1(array $array): void
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
 		assertType('list<mixed>', 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'));
+		assertType('non-empty-array<string>', array_column($array, 'nodeName', 'foo'));
+		assertType('non-empty-array<DOMElement>', array_column($array, null, 'foo'));
 	}
 
 	/** @param array{DOMElement} $array */
@@ -201,8 +201,8 @@ public function testObjects2(array $array): void
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
 		assertType('list<mixed>', 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'));
+		assertType('non-empty-array<string>', array_column($array, 'nodeName', 'foo'));
+		assertType('non-empty-array<DOMElement>', array_column($array, null, 'foo'));
 	}
 
 }

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

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

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

@@ -20,7 +20,7 @@ function foo3($list)
 {
 	$flip = array_flip($list);
 
-	assertType('array<int|string, (int|string)>', $flip);
+	assertType('array<(int|string)>', $flip);
 }
 
 /**

tests/PHPStan/Analyser/nsrt/non-empty-array.php

@@ -54,7 +54,7 @@ public function arrayFunctions($array, $list, $stringArray): void
 		assertType('non-empty-array', array_replace($array, []));
 		assertType('non-empty-array', array_replace($array, $array));
 
-		assertType('non-empty-array<int|string, (int|string)>', array_flip($array));
+		assertType('non-empty-array<(int|string)>', array_flip($array));
 		assertType('non-empty-array<string, (int|string)>', array_flip($stringArray));
 	}
 }

tests/PHPStan/Rules/Arrays/data/slevomat-foreach-array-key-exists-bug.php

@@ -15,26 +15,26 @@ public function doFoo(array $percentageIntervals, array $changes): void
 				if ($percentageInterval->isInInterval((float) $changeInPercents)) {
 					$key = $percentageInterval->getFormatted();
 					if (array_key_exists($key, $intervalResults)) {
-						assertType('array<int|string, array{itemsCount: mixed, interval: mixed}>', $intervalResults);
+						assertType('array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);
 						assertType('array{itemsCount: mixed, interval: mixed}', $intervalResults[$key]);
 						$intervalResults[$key]['itemsCount'] += $itemsCount;
-						assertType('non-empty-array<int|string, array{itemsCount: (array|float|int), interval: mixed}>', $intervalResults);
+						assertType('non-empty-array<array{itemsCount: (array|float|int), interval: mixed}>', $intervalResults);
 						assertType('array{itemsCount: (array|float|int), interval: mixed}', $intervalResults[$key]);
 					} else {
-						assertType('array<int|string, array{itemsCount: mixed, interval: mixed}>', $intervalResults);
+						assertType('array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);
 						assertType('array{itemsCount: mixed, interval: mixed}', $intervalResults[$key]);
 						$intervalResults[$key] = [
 							'itemsCount' => $itemsCount,
 							'interval' => $percentageInterval,
 						];
-						assertType('non-empty-array<int|string, array{itemsCount: mixed, interval: mixed}>', $intervalResults);
+						assertType('non-empty-array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);
 						assertType('array{itemsCount: mixed, interval: mixed}', $intervalResults[$key]);
 					}
 				}
 			}
 		}
 
-		assertType('array<int|string, array{itemsCount: mixed, interval: mixed}>', $intervalResults);
+		assertType('array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);
 		foreach ($intervalResults as $data) {
 			echo $data['interval'];
 		}