Wip

Author: VincentLanglet

composer.json

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

tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php

@@ -11,6 +11,7 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -308,12 +309,17 @@ private static function list(Type $values): Type
 		return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), $values));
 	}
 
-	private static function numericString(): Type
+	private static function numericString(bool $lowercase = false): Type
 	{
-		return new IntersectionType([
+		$types = [
 			new StringType(),
 			new AccessoryNumericStringType(),
-		]);
+		];
+		if ($lowercase) {
+			$types[] = new AccessoryLowercaseStringType();
+		}
+
+		return new IntersectionType($types);
 	}
 
 	/**

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -15,6 +15,7 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -376,7 +377,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantIntegerType(0), new ObjectType(One::class)],
-					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString(true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -398,7 +399,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantIntegerType(0), new ObjectType(Many::class)],
-					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString(true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -419,7 +420,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantStringType('one'), new ObjectType(One::class)],
-					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString(true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -529,7 +530,7 @@ public function getTestData(): iterable
 		yield 'just root entity and scalars' => [
 			$this->constantArray([
 				[new ConstantIntegerType(0), new ObjectType(One::class)],
-				[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
+				[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString(true)],
 			]),
 			'
 				SELECT		o, o.id
@@ -1474,7 +1475,7 @@ public function getTestData(): iterable
 			$this->constantArray([
 				[new ConstantStringType('minusInt'), $this->stringifies() ? new ConstantStringType('-1') : new ConstantIntegerType(-1)],
 				[new ConstantStringType('minusFloat'), $this->stringifies() ? $this->numericString() : new ConstantFloatType(-0.1)],
-				[new ConstantStringType('minusIntRange'), $this->stringifies() ? $this->numericString() : IntegerRangeType::fromInterval(null, 0)],
+				[new ConstantStringType('minusIntRange'), $this->stringifies() ? $this->numericString(true) : IntegerRangeType::fromInterval(null, 0)],
 			]),
 			'
 				SELECT		-1 as minusInt,
@@ -1523,7 +1524,7 @@ private function yieldConditionalDataset(): iterable
 					],
 					[
 						new ConstantIntegerType(3),
-						$this->numericString(),
+						$this->numericString(true),
 					],
 				]),
 				'
@@ -1622,12 +1623,17 @@ private function constantArray(array $elements): Type
 		return $builder->getArray();
 	}
 
-	private function numericString(): Type
+	private function numericString(bool $lowercase = false): Type
 	{
-		return new IntersectionType([
+		$types = [
 			new StringType(),
 			new AccessoryNumericStringType(),
-		]);
+		];
+		if ($lowercase) {
+			$types[] = new AccessoryLowercaseStringType();
+		}
+
+		return new IntersectionType($types);
 	}
 
 	private function uint(): Type
@@ -1673,14 +1679,14 @@ private function stringifies(): bool
 	private function intOrStringified(): Type
 	{
 		return $this->stringifies()
-			? $this->numericString()
+			? $this->numericString(true)
 			: new IntegerType();
 	}
 
 	private function uintOrStringified(): Type
 	{
 		return $this->stringifies()
-			? $this->numericString()
+			? $this->numericString(true)
 			: $this->uint();
 	}