Integer::toString() and Float::toString() are uppercase-string

VincentLanglet · web-flow · commit 01bf65c59918 · 2024-11-20T13:42:31.000+01:00
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -7,6 +7,7 @@
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Traits\NonArrayTypeTrait;
@@ -134,6 +135,7 @@ public function toString(): Type
 	{
 		return new IntersectionType([
 			new StringType(),
+			new AccessoryUppercaseStringType(),
 			new AccessoryNumericStringType(),
 		]);
 	}
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
@@ -13,6 +13,7 @@
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use function array_filter;
@@ -487,6 +488,7 @@ public function toString(): Type
 			return new IntersectionType([
 				new StringType(),
 				new AccessoryLowercaseStringType(),
+				new AccessoryUppercaseStringType(),
 				new AccessoryNumericStringType(),
 				new AccessoryNonFalsyStringType(),
 			]);
@@ -495,6 +497,7 @@ public function toString(): Type
 		return new IntersectionType([
 			new StringType(),
 			new AccessoryLowercaseStringType(),
+			new AccessoryUppercaseStringType(),
 			new AccessoryNumericStringType(),
 		]);
 	}
diff --git a/src/Type/IntegerType.php b/src/Type/IntegerType.php
@@ -8,6 +8,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Traits\NonArrayTypeTrait;
@@ -83,6 +84,7 @@ public function toString(): Type
 		return new IntersectionType([
 			new StringType(),
 			new AccessoryLowercaseStringType(),
+			new AccessoryUppercaseStringType(),
 			new AccessoryNumericStringType(),
 		]);
 	}
diff --git a/tests/PHPStan/Analyser/nsrt/array-fill-keys.php b/tests/PHPStan/Analyser/nsrt/array-fill-keys.php
@@ -91,7 +91,7 @@ function withNotConstantArray(array $foo, array $bar, array $baz, array $floats,
 	assertType("array<string, null>", array_fill_keys($foo, null));
 	assertType("array<int, null>", array_fill_keys($bar, null));
 	assertType("array<'foo', null>", array_fill_keys($baz, null));
-	assertType("array<numeric-string, null>", array_fill_keys($floats, null));
+	assertType("array<numeric-string&uppercase-string, null>", array_fill_keys($floats, null));
 	assertType("array<bool|int|string, null>", array_fill_keys($mixed, null));
 	assertType('array<string, null>', array_fill_keys($list, null));
 	assertType('*ERROR*', array_fill_keys($objectsWithoutToString, null));
diff --git a/tests/PHPStan/Analyser/nsrt/array-key-exists.php b/tests/PHPStan/Analyser/nsrt/array-key-exists.php
@@ -50,16 +50,16 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int
 			assertType('int', $key1);
 		}
 		if (array_key_exists($key2, $a)) {
-			assertType('lowercase-string&numeric-string', $key2);
+			assertType('lowercase-string&numeric-string&uppercase-string', $key2);
 		}
 		if (array_key_exists($key3, $a)) {
-			assertType('int|(lowercase-string&numeric-string)', $key3);
+			assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key3);
 		}
 		if (array_key_exists($key4, $a)) {
-			assertType('(int|(lowercase-string&numeric-string))', $key4);
+			assertType('(int|(lowercase-string&numeric-string&uppercase-string))', $key4);
 		}
 		if (array_key_exists($key5, $a)) {
-			assertType('int|(lowercase-string&numeric-string)', $key5);
+			assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key5);
 		}
 
 		if (array_key_exists($key1, $b)) {
diff --git a/tests/PHPStan/Analyser/nsrt/bug-10863.php b/tests/PHPStan/Analyser/nsrt/bug-10863.php
@@ -12,15 +12,15 @@ class Foo
 	 */
 	public function doFoo($b): void
 	{
-		assertType('lowercase-string&non-falsy-string', '@' . $b);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', '@' . $b);
 	}
 
 	/**
 	 * @param int|false $b
 	 */
 	public function doFoo2($b): void
 	{
-		assertType('lowercase-string&non-falsy-string', '@' . $b);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', '@' . $b);
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/nsrt/bug-11129.php b/tests/PHPStan/Analyser/nsrt/bug-11129.php
@@ -21,14 +21,14 @@ public function foo(
 		$maybeNegativeConstStrings, $maybeNonNumericConstStrings, $maybeFloatConstStrings,
 		bool $bool, float $float
 	): void {
-		assertType('lowercase-string&non-falsy-string', '0'.$i);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $i.'0');
+		assertType('lowercase-string&non-falsy-string&uppercase-string', '0'.$i);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.'0');
 
-		assertType('lowercase-string&non-falsy-string&numeric-string', '0'.$positiveInt);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $positiveInt.'0');
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', '0'.$positiveInt);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positiveInt.'0');
 
-		assertType('lowercase-string&non-falsy-string', '0'.$negativeInt);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $negativeInt.'0');
+		assertType('lowercase-string&non-falsy-string&uppercase-string', '0'.$negativeInt);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $negativeInt.'0');
 
 		assertType("'00'|'01'|'02'", '0'.$positiveConstStrings);
 		assertType( "'00'|'10'|'20'", $positiveConstStrings.'0');
@@ -39,36 +39,36 @@ public function foo(
 		assertType("'00'|'01'|'0a'", '0'.$maybeNonNumericConstStrings);
 		assertType("'00'|'10'|'a0'", $maybeNonNumericConstStrings.'0');
 
-		assertType('lowercase-string&non-falsy-string&numeric-string', $i.$positiveConstStrings);
-		assertType('lowercase-string&non-falsy-string', $positiveConstStrings.$i);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.$positiveConstStrings);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $positiveConstStrings.$i);
 
-		assertType('lowercase-string&non-falsy-string', $i.$maybeNegativeConstStrings);
-		assertType('lowercase-string&non-falsy-string', $maybeNegativeConstStrings.$i);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.$maybeNegativeConstStrings);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $maybeNegativeConstStrings.$i);
 
 		assertType('lowercase-string&non-falsy-string', $i.$maybeNonNumericConstStrings);
 		assertType('lowercase-string&non-falsy-string', $maybeNonNumericConstStrings.$i);
 
-		assertType('lowercase-string&non-falsy-string', $i.$maybeFloatConstStrings); // could be 'lowercase-string&non-falsy-string&numeric-string'
-		assertType('lowercase-string&non-falsy-string', $maybeFloatConstStrings.$i);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.$maybeFloatConstStrings); // could be 'lowercase-string&non-falsy-string&numeric-string'
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $maybeFloatConstStrings.$i);
 
-		assertType('lowercase-string&non-empty-string&numeric-string', $i.$bool);
-		assertType('lowercase-string&non-empty-string', $bool.$i);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $positiveInt.$bool);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $bool.$positiveInt);
-		assertType('lowercase-string&non-falsy-string&numeric-string', $negativeInt.$bool);
-		assertType('lowercase-string&non-falsy-string', $bool.$negativeInt);
+		assertType('lowercase-string&non-empty-string&numeric-string&uppercase-string', $i.$bool);
+		assertType('lowercase-string&non-empty-string&uppercase-string', $bool.$i);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positiveInt.$bool);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $bool.$positiveInt);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $negativeInt.$bool);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $bool.$negativeInt);
 
-		assertType('lowercase-string&non-falsy-string', $i.$i);
-		assertType('lowercase-string&non-falsy-string', $negativeInt.$negativeInt);
-		assertType('lowercase-string&non-falsy-string', $maybeNegativeConstStrings.$negativeInt);
-		assertType('lowercase-string&non-falsy-string', $negativeInt.$maybeNegativeConstStrings);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $i.$i);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $negativeInt.$negativeInt);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $maybeNegativeConstStrings.$negativeInt);
+		assertType('lowercase-string&non-falsy-string&uppercase-string', $negativeInt.$maybeNegativeConstStrings);
 
 		// https://3v4l.org/BCS2K
-		assertType('non-falsy-string', $float.$float);
-		assertType('non-falsy-string&numeric-string', $float.$positiveInt);
-		assertType('non-falsy-string', $float.$negativeInt);
-		assertType('non-falsy-string', $float.$i);
-		assertType('non-falsy-string', $i.$float); // could be 'non-falsy-string&numeric-string'
+		assertType('non-falsy-string&uppercase-string', $float.$float);
+		assertType('non-falsy-string&numeric-string&uppercase-string', $float.$positiveInt);
+		assertType('non-falsy-string&uppercase-string', $float.$negativeInt);
+		assertType('non-falsy-string&uppercase-string', $float.$i);
+		assertType('non-falsy-string&uppercase-string', $i.$float); // could be 'non-falsy-string&numeric-string&uppercase-string'
 		assertType('non-falsy-string', $numericString.$float);
 		assertType('non-falsy-string', $numericString.$maybeFloatConstStrings);
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-11716.php b/tests/PHPStan/Analyser/nsrt/bug-11716.php
@@ -75,7 +75,7 @@ function narrowKey($mixed, string $s, int $i, array $generalArr, array $intKeyed
 	assertType('int', $i);
 
 	if (isset($intKeyedArr[$s])) {
-		assertType("lowercase-string&numeric-string", $s);
+		assertType("lowercase-string&numeric-string&uppercase-string", $s);
 	} else {
 		assertType('string', $s);
 	}
diff --git a/tests/PHPStan/Analyser/nsrt/bug-4587.php b/tests/PHPStan/Analyser/nsrt/bug-4587.php
@@ -27,11 +27,11 @@ public function b(): void
 		$type = array_map(static function (array $result): array {
 			assertType('array{a: int}', $result);
 			$result['a'] = (string) $result['a'];
-			assertType('array{a: lowercase-string&numeric-string}', $result);
+			assertType('array{a: lowercase-string&numeric-string&uppercase-string}', $result);
 
 			return $result;
 		}, $results);
 
-		assertType('list<array{a: lowercase-string&numeric-string}>', $type);
+		assertType('list<array{a: lowercase-string&numeric-string&uppercase-string}>', $type);
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/bug-7387.php b/tests/PHPStan/Analyser/nsrt/bug-7387.php
@@ -29,7 +29,7 @@ public function inputTypes(int $i, float $f, string $s, int $intRange) {
 
 	public function specifiers(int $i) {
 		// https://3v4l.org/fmVIg
-		assertType('lowercase-string&numeric-string', sprintf('%14s', $i));
+		assertType('lowercase-string&numeric-string&uppercase-string', sprintf('%14s', $i));
 
 		assertType('lowercase-string&numeric-string', sprintf('%d', $i));
 
@@ -59,9 +59,9 @@ public function specifiers(int $i) {
 	 */
 	public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt, int $negInt, int $nonZeroIntRange, int $intRange) {
 		// https://3v4l.org/vVL0c
-		assertType('lowercase-string&numeric-string', sprintf('%2$6s', $mixed, $i));
-		assertType('lowercase-string&non-falsy-string&numeric-string', sprintf('%2$6s', $mixed, $posInt));
-		assertType('lowercase-string&non-falsy-string&numeric-string', sprintf('%2$6s', $mixed, $negInt));
+		assertType('lowercase-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $i));
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $posInt));
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $negInt));
 		assertType("'     1'|'     2'|'     3'|'     4'|'     5'", sprintf('%2$6s', $mixed, $nonZeroIntRange));
 
 		// https://3v4l.org/1ECIq
diff --git a/tests/PHPStan/Analyser/nsrt/bug-8635.php b/tests/PHPStan/Analyser/nsrt/bug-8635.php
@@ -8,6 +8,6 @@ class HelloWorld
 {
 	public function EchoInt(int $value): void
 	{
-		assertType('lowercase-string&numeric-string', "$value");
+		assertType('lowercase-string&numeric-string&uppercase-string', "$value");
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/cast-to-numeric-string.php b/tests/PHPStan/Analyser/nsrt/cast-to-numeric-string.php
@@ -13,13 +13,13 @@
  * @param 1 $constantInt
  */
 function foo(int $a, float $b, $numeric, $numeric2, $number, $positive, $negative, $constantInt): void {
-	assertType('lowercase-string&numeric-string', (string)$a);
-	assertType('numeric-string', (string)$b);
+	assertType('lowercase-string&numeric-string&uppercase-string', (string)$a);
+	assertType('numeric-string&uppercase-string', (string)$b);
 	assertType('numeric-string', (string)$numeric);
 	assertType('numeric-string', (string)$numeric2);
-	assertType('numeric-string', (string)$number);
-	assertType('lowercase-string&non-falsy-string&numeric-string', (string)$positive);
-	assertType('lowercase-string&non-falsy-string&numeric-string', (string)$negative);
+	assertType('numeric-string&uppercase-string', (string)$number);
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string)$positive);
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string)$negative);
 	assertType("'1'", (string)$constantInt);
 }
 
@@ -32,32 +32,32 @@ function foo(int $a, float $b, $numeric, $numeric2, $number, $positive, $negativ
  * @param 1 $constantInt
  */
 function concatEmptyString(int $a, float $b, $numeric, $numeric2, $number, $positive, $negative, $constantInt): void {
-	assertType('lowercase-string&numeric-string', '' . $a);
-	assertType('numeric-string', '' . $b);
+	assertType('lowercase-string&numeric-string&uppercase-string', '' . $a);
+	assertType('numeric-string&uppercase-string', '' . $b);
 	assertType('numeric-string', '' . $numeric);
 	assertType('numeric-string', '' . $numeric2);
-	assertType('numeric-string', '' . $number);
-	assertType('lowercase-string&non-falsy-string&numeric-string', '' . $positive);
-	assertType('lowercase-string&non-falsy-string&numeric-string', '' . $negative);
+	assertType('numeric-string&uppercase-string', '' . $number);
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', '' . $positive);
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', '' . $negative);
 	assertType("'1'", '' . $constantInt);
 
-	assertType('lowercase-string&numeric-string', $a . '');
-	assertType('numeric-string', $b . '');
+	assertType('lowercase-string&numeric-string&uppercase-string', $a . '');
+	assertType('numeric-string&uppercase-string', $b . '');
 	assertType('numeric-string', $numeric . '');
 	assertType('numeric-string', $numeric2 . '');
-	assertType('numeric-string', $number . '');
-	assertType('lowercase-string&non-falsy-string&numeric-string', $positive . '');
-	assertType('lowercase-string&non-falsy-string&numeric-string', $negative . '');
+	assertType('numeric-string&uppercase-string', $number . '');
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positive . '');
+	assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $negative . '');
 	assertType("'1'", $constantInt . '');
 }
 
 function concatAssignEmptyString(int $i, float $f) {
 	$i .= '';
-	assertType('lowercase-string&numeric-string', $i);
+	assertType('lowercase-string&numeric-string&uppercase-string', $i);
 
 	$s = '';
 	$s .= $f;
-	assertType('numeric-string', $s);
+	assertType('numeric-string&uppercase-string', $s);
 }
 
 /**
@@ -66,13 +66,13 @@ function concatAssignEmptyString(int $i, float $f) {
  */
 function integerRangeToString($positive, $negative)
 {
-	assertType('lowercase-string&numeric-string', (string) $positive);
-	assertType('lowercase-string&numeric-string', (string) $negative);
+	assertType('lowercase-string&numeric-string&uppercase-string', (string) $positive);
+	assertType('lowercase-string&numeric-string&uppercase-string', (string) $negative);
 
 	if ($positive !== 0) {
-		assertType('lowercase-string&non-falsy-string&numeric-string', (string) $positive);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string) $positive);
 	}
 	if ($negative !== 0) {
-		assertType('lowercase-string&non-falsy-string&numeric-string', (string) $negative);
+		assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string) $negative);
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/filter-var.php b/tests/PHPStan/Analyser/nsrt/filter-var.php
@@ -154,11 +154,11 @@ public function scalars(bool $bool, float $float, int $int, string $string, int
 		assertType("''|'1'", filter_var($bool));
 		assertType("'1'", filter_var(true));
 		assertType("''", filter_var(false));
-		assertType('numeric-string', filter_var($float));
+		assertType('numeric-string&uppercase-string', filter_var($float));
 		assertType("'17'", filter_var(17.0));
 		assertType("'17.1'", filter_var(17.1));
 		assertType("'1.0E-50'", filter_var(1e-50));
-		assertType('lowercase-string&numeric-string', filter_var($int));
+		assertType('lowercase-string&numeric-string&uppercase-string', filter_var($int));
 		assertType("'0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'", filter_var($intRange));
 		assertType("'17'", filter_var(17));
 		assertType('string', filter_var($string));
diff --git a/tests/PHPStan/Analyser/nsrt/generics.php b/tests/PHPStan/Analyser/nsrt/generics.php
@@ -147,10 +147,10 @@ function f($a, $b)
  */
 function testF($arrayOfInt, $callableOrNull)
 {
-	assertType('Closure(int): (lowercase-string&numeric-string)', function (int $a): string {
+	assertType('Closure(int): (lowercase-string&numeric-string&uppercase-string)', function (int $a): string {
 		return (string)$a;
 	});
-	assertType('array<lowercase-string&numeric-string>', f($arrayOfInt, function (int $a): string {
+	assertType('array<lowercase-string&numeric-string&uppercase-string>', f($arrayOfInt, function (int $a): string {
 		return (string)$a;
 	}));
 	assertType('Closure(mixed): string', function ($a): string {
@@ -224,7 +224,7 @@ function testArrayMap(array $listOfIntegers)
 
 		return (string) $int;
 	}, $listOfIntegers);
-	assertType('array<lowercase-string&numeric-string>', $strings);
+	assertType('array<lowercase-string&numeric-string&uppercase-string>', $strings);
 }
 
 /**
diff --git a/tests/PHPStan/Analyser/nsrt/key-exists.php b/tests/PHPStan/Analyser/nsrt/key-exists.php
@@ -49,16 +49,16 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int
 			assertType('int', $key1);
 		}
 		if (key_exists($key2, $a)) {
-			assertType('lowercase-string&numeric-string', $key2);
+			assertType('lowercase-string&numeric-string&uppercase-string', $key2);
 		}
 		if (key_exists($key3, $a)) {
-			assertType('int|(lowercase-string&numeric-string)', $key3);
+			assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key3);
 		}
 		if (key_exists($key4, $a)) {
-			assertType('(int|(lowercase-string&numeric-string))', $key4);
+			assertType('(int|(lowercase-string&numeric-string&uppercase-string))', $key4);
 		}
 		if (key_exists($key5, $a)) {
-			assertType('int|(lowercase-string&numeric-string)', $key5);
+			assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key5);
 		}
 
 		if (key_exists($key1, $b)) {
diff --git a/tests/PHPStan/Analyser/nsrt/non-empty-string-replace-functions.php b/tests/PHPStan/Analyser/nsrt/non-empty-string-replace-functions.php
@@ -26,9 +26,9 @@ public function replace(string $search, string $replacement, string $subject){
 
 	function foo(float $f) {
 		$s = (string) $f;
-		assertType('numeric-string', $s);
+		assertType('numeric-string&uppercase-string', $s);
 
 		$price = str_replace(',', '.', $s);
-		assertType('non-empty-string', $price);
+		assertType('non-empty-string&uppercase-string', $price);
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/range-to-string.php b/tests/PHPStan/Analyser/nsrt/range-to-string.php
@@ -17,6 +17,6 @@ public function sayHello($i, $ii, $maxlong, $toolong): void
 		assertType("'10'|'5'|'6'|'7'|'8'|'9'", (string) $i);
 		assertType("'-1'|'-10'|'-2'|'-3'|'-4'|'-5'|'-6'|'-7'|'-8'|'-9'|'0'|'1'|'10'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'", (string) $ii);
 		assertType("'0'|'1'|'10'|'100'|'101'|'102'|'103'|'104'|'105'|'106'|'107'|'108'|'109'|'11'|'110'|'111'|'112'|'113'|'114'|'115'|'116'|'117'|'118'|'119'|'12'|'120'|'121'|'122'|'123'|'124'|'125'|'126'|'127'|'128'|'13'|'14'|'15'|'16'|'17'|'18'|'19'|'2'|'20'|'21'|'22'|'23'|'24'|'25'|'26'|'27'|'28'|'29'|'3'|'30'|'31'|'32'|'33'|'34'|'35'|'36'|'37'|'38'|'39'|'4'|'40'|'41'|'42'|'43'|'44'|'45'|'46'|'47'|'48'|'49'|'5'|'50'|'51'|'52'|'53'|'54'|'55'|'56'|'57'|'58'|'59'|'6'|'60'|'61'|'62'|'63'|'64'|'65'|'66'|'67'|'68'|'69'|'7'|'70'|'71'|'72'|'73'|'74'|'75'|'76'|'77'|'78'|'79'|'8'|'80'|'81'|'82'|'83'|'84'|'85'|'86'|'87'|'88'|'89'|'9'|'90'|'91'|'92'|'93'|'94'|'95'|'96'|'97'|'98'|'99'", (string) $maxlong);
-		assertType("lowercase-string&numeric-string", (string) $toolong);
+		assertType("lowercase-string&numeric-string&uppercase-string", (string) $toolong);
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php b/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php
diff --git a/tests/PHPStan/Analyser/nsrt/strval.php b/tests/PHPStan/Analyser/nsrt/strval.php
diff --git a/tests/PHPStan/Rules/Generics/data/bug-6301.php b/tests/PHPStan/Rules/Generics/data/bug-6301.php

Original file line number	Diff line number	Diff line change
`@@ -50,16 +50,16 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int`
`50`	`50`	`assertType('int', $key1);`
`51`	`51`	`}`
`52`	`52`	`if (array_key_exists($key2, $a)) {`
`53`		`- assertType('lowercase-string&numeric-string', $key2);`
	`53`	`+ assertType('lowercase-string&numeric-string&uppercase-string', $key2);`
`54`	`54`	`}`
`55`	`55`	`if (array_key_exists($key3, $a)) {`
`56`		`- assertType('int\|(lowercase-string&numeric-string)', $key3);`
	`56`	`+ assertType('int\|(lowercase-string&numeric-string&uppercase-string)', $key3);`
`57`	`57`	`}`
`58`	`58`	`if (array_key_exists($key4, $a)) {`
`59`		`- assertType('(int\|(lowercase-string&numeric-string))', $key4);`
	`59`	`+ assertType('(int\|(lowercase-string&numeric-string&uppercase-string))', $key4);`
`60`	`60`	`}`
`61`	`61`	`if (array_key_exists($key5, $a)) {`
`62`		`- assertType('int\|(lowercase-string&numeric-string)', $key5);`
	`62`	`+ assertType('int\|(lowercase-string&numeric-string&uppercase-string)', $key5);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (array_key_exists($key1, $b)) {`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,15 @@ class Foo`
`12`	`12`	`*/`
`13`	`13`	`public function doFoo($b): void`
`14`	`14`	`{`
`15`		`- assertType('lowercase-string&non-falsy-string', '@' . $b);`
	`15`	`+ assertType('lowercase-string&non-falsy-string&uppercase-string', '@' . $b);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @param int\|false $b`
`20`	`20`	`*/`
`21`	`21`	`public function doFoo2($b): void`
`22`	`22`	`{`
`23`		`- assertType('lowercase-string&non-falsy-string', '@' . $b);`
	`23`	`+ assertType('lowercase-string&non-falsy-string&uppercase-string', '@' . $b);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ function narrowKey($mixed, string $s, int $i, array $generalArr, array $intKeyed`
`75`	`75`	`assertType('int', $i);`
`76`	`76`
`77`	`77`	`if (isset($intKeyedArr[$s])) {`
`78`		`- assertType("lowercase-string&numeric-string", $s);`
	`78`	`+ assertType("lowercase-string&numeric-string&uppercase-string", $s);`
`79`	`79`	`} else {`
`80`	`80`	`assertType('string', $s);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public function b(): void`
`27`	`27`	`$type = array_map(static function (array $result): array {`
`28`	`28`	`assertType('array{a: int}', $result);`
`29`	`29`	`$result['a'] = (string) $result['a'];`
`30`		`- assertType('array{a: lowercase-string&numeric-string}', $result);`
	`30`	`+ assertType('array{a: lowercase-string&numeric-string&uppercase-string}', $result);`
`31`	`31`
`32`	`32`	`return $result;`
`33`	`33`	`}, $results);`
`34`	`34`
`35`		`- assertType('list<array{a: lowercase-string&numeric-string}>', $type);`
	`35`	`+ assertType('list<array{a: lowercase-string&numeric-string&uppercase-string}>', $type);`
`36`	`36`	`}`
`37`	`37`	`}`