Fixing tests

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.2 || ^8.0",
-		"phpstan/phpstan": "^1.12.6"
+		"phpstan/phpstan": "^1.12.12"
 	},
 	"conflict": {
 		"doctrine/collections": "<1.0",

src/Type/Doctrine/Descriptors/BigIntType.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use Composer\InstalledVersions;
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -25,7 +24,7 @@ public function getWritableToPropertyType(): Type
 			return new IntegerType();
 		}
 
-		return TypeCombinator::intersect(new StringType(), new AccessoryNumericStringType());
+		return (new IntegerType())->toString();
 	}
 
 	public function getWritableToDatabaseType(): Type

src/Type/Doctrine/Descriptors/DecimalType.php

@@ -4,10 +4,8 @@
 
 use Doctrine\DBAL\Connection;
 use PHPStan\Doctrine\Driver\DriverDetector;
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\IntersectionType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -31,7 +29,7 @@ public function getType(): string
 
 	public function getWritableToPropertyType(): Type
 	{
-		return TypeCombinator::intersect(new StringType(), new AccessoryNumericStringType());
+		return (new FloatType())->toString();
 	}
 
 	public function getWritableToDatabaseType(): Type
@@ -58,10 +56,7 @@ public function getDatabaseInternalTypeForDriver(Connection $connection): Type
 			DriverDetector::PGSQL,
 			DriverDetector::PDO_PGSQL,
 		], true)) {
-			return new IntersectionType([
-				new StringType(),
-				new AccessoryNumericStringType(),
-			]);
+			return (new FloatType())->toString();
 		}
 
 		// not yet supported driver, return the old implementation guess

src/Type/Doctrine/Descriptors/FloatType.php

@@ -4,10 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use PHPStan\Doctrine\Driver\DriverDetector;
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\IntersectionType;
-use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use function in_array;
@@ -42,10 +39,7 @@ public function getDatabaseInternalType(): Type
 	{
 		return TypeCombinator::union(
 			new \PHPStan\Type\FloatType(),
-			new IntersectionType([
-				new StringType(),
-				new AccessoryNumericStringType(),
-			])
+			(new \PHPStan\Type\FloatType())->toString()
 		);
 	}
 

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -18,7 +18,9 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
@@ -630,10 +632,10 @@ public function walkFunction($function): string
 						$type = $this->createFloat(false);
 
 					} elseif ($castedExprType->isNumericString()->yes()) {
-						$type = $this->createNumericString(false);
+						$type = $this->createNumericString(false, $castedExprType->isLowercaseString()->yes(), $castedExprType->isUppercaseString()->yes());
 
 					} else {
-						$type = TypeCombinator::union($this->createFloat(false), $this->createNumericString(false));
+						$type = TypeCombinator::union($this->createFloat(false), $this->createNumericString(false, false, true));
 					}
 
 				} else {
@@ -746,7 +748,7 @@ private function inferAvgFunction(AST\Functions\AvgFunction $function): Type
 
 		if ($this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::MYSQLI) {
 			if ($exprTypeNoNull->isInteger()->yes()) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString($nullable, true, true);
 			}
 
 			if ($exprTypeNoNull->isString()->yes() && !$exprTypeNoNull->isNumericString()->yes()) {
@@ -758,7 +760,7 @@ private function inferAvgFunction(AST\Functions\AvgFunction $function): Type
 
 		if ($this->driverType === DriverDetector::PGSQL || $this->driverType === DriverDetector::PDO_PGSQL) {
 			if ($exprTypeNoNull->isInteger()->yes()) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString($nullable, true, true);
 			}
 
 			return $this->generalizeConstantType($exprType, $nullable);
@@ -794,7 +796,7 @@ private function inferSumFunction(AST\Functions\SumFunction $function): Type
 
 		if ($this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::MYSQLI) {
 			if ($exprTypeNoNull->isInteger()->yes()) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString($nullable, true, true);
 			}
 
 			if ($exprTypeNoNull->isString()->yes() && !$exprTypeNoNull->isNumericString()->yes()) {
@@ -808,7 +810,7 @@ private function inferSumFunction(AST\Functions\SumFunction $function): Type
 			if ($exprTypeNoNull->isInteger()->yes()) {
 				return TypeCombinator::union(
 					$this->createInteger($nullable),
-					$this->createNumericString($nullable)
+					$this->createNumericString($nullable, true, true)
 				);
 			}
 
@@ -845,19 +847,41 @@ private function createNonNegativeInteger(bool $nullable): Type
 		return $nullable ? TypeCombinator::addNull($integer) : $integer;
 	}
 
-	private function createNumericString(bool $nullable): Type
+	private function createNumericString(bool $nullable, bool $lowercase = false, bool $uppercase = false): Type
 	{
-		$numericString = TypeCombinator::intersect(
+		$types = [
 			new StringType(),
-			new AccessoryNumericStringType()
-		);
+			new AccessoryNumericStringType(),
+		];
+		if ($lowercase) {
+			$types[] = new AccessoryLowercaseStringType();
+		}
+		if ($uppercase) {
+			$types[] = new AccessoryUppercaseStringType();
+		}
+
+		$numericString = new IntersectionType($types);
 
 		return $nullable ? TypeCombinator::addNull($numericString) : $numericString;
 	}
 
-	private function createString(bool $nullable): Type
+	private function createString(bool $nullable, bool $lowercase = false, bool $uppercase = false): Type
 	{
-		$string = new StringType();
+		if ($lowercase || $uppercase) {
+			$types = [
+				new StringType(),
+			];
+			if ($lowercase) {
+				$types[] = new AccessoryLowercaseStringType();
+			}
+			if ($uppercase) {
+				$types[] = new AccessoryUppercaseStringType();
+			}
+			$string = new IntersectionType($types);
+		} else {
+			$string = new StringType();
+		}
+
 		return $nullable ? TypeCombinator::addNull($string) : $string;
 	}
 
@@ -903,10 +927,18 @@ private function generalizeConstantType(Type $type, bool $makeNullable): Type
 			$result = $this->createFloat($containsNull);
 
 		} elseif ($typeNoNull->isNumericString()->yes()) {
-			$result = $this->createNumericString($containsNull);
+			$result = $this->createNumericString(
+				$containsNull,
+				$typeNoNull->isLowercaseString()->yes(),
+				$typeNoNull->isUppercaseString()->yes()
+			);
 
 		} elseif ($typeNoNull->isString()->yes()) {
-			$result = $this->createString($containsNull);
+			$result = $this->createString(
+				$containsNull,
+				$typeNoNull->isLowercaseString()->yes(),
+				$typeNoNull->isUppercaseString()->yes()
+			);
 
 		} else {
 			$result = $type;
@@ -1249,7 +1281,7 @@ public function walkSelectExpression($selectExpression): string
 
 						// e.g. 1.0 on sqlite results to '1' with pdo_stringify on PHP 8.1, but '1.0' on PHP 8.0 with no setup
 						// so we relax constant types and return just numeric-string to avoid those issues
-						$stringifiedFloat = $this->createNumericString(false);
+						$stringifiedFloat = $this->createNumericString(false, false, true);
 
 						if ($stringify->yes()) {
 							return $stringifiedFloat;
@@ -1781,7 +1813,11 @@ private function inferPlusMinusTimesType(array $termTypes): Type
 			}
 
 			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), $this->createNumericString(false)])) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString(
+					$nullable,
+					$unionWithoutNull->toString()->isLowercaseString()->yes(),
+					$unionWithoutNull->toString()->isUppercaseString()->yes()
+				);
 			}
 
 			if ($this->containsOnlyNumericTypes($unionWithoutNull)) {
@@ -1833,7 +1869,7 @@ private function inferDivisionType(array $termTypes): Type
 
 		if ($unionWithoutNull->isInteger()->yes()) {
 			if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString($nullable, true, true);
 			} elseif ($this->driverType === DriverDetector::PDO_PGSQL || $this->driverType === DriverDetector::PGSQL || $this->driverType === DriverDetector::SQLITE3 || $this->driverType === DriverDetector::PDO_SQLITE) {
 				return $this->createInteger($nullable);
 			}
@@ -1861,7 +1897,11 @@ private function inferDivisionType(array $termTypes): Type
 			}
 
 			if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), $this->createNumericString(false)])) {
-				return $this->createNumericString($nullable);
+				return $this->createNumericString(
+					$nullable,
+					$unionWithoutNull->toString()->isLowercaseString()->yes(),
+					$unionWithoutNull->toString()->isUppercaseString()->yes()
+				);
 			}
 
 			if ($this->containsOnlyTypes($unionWithoutNull, [new FloatType(), $this->createNumericString(false)])) {