Fixes

Author: VincentLanglet

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;

tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php

@@ -142,7 +142,7 @@ public static function getTestData(): iterable
 
 		yield 'getResult(object), fields' => [
 			self::list(self::constantArray([
-				[new ConstantStringType('decimalColumn'), self::numericString()],
+				[new ConstantStringType('decimalColumn'), self::numericString(false, true)],
 				[new ConstantStringType('floatColumn'), new FloatType()],
 			])),
 			'
@@ -178,7 +178,7 @@ public static function getTestData(): iterable
 
 		yield 'toIterable(object), fields' => [
 			new IterableType(new IntegerType(), self::constantArray([
-				[new ConstantStringType('decimalColumn'), self::numericString()],
+				[new ConstantStringType('decimalColumn'), self::numericString(false, true)],
 				[new ConstantStringType('floatColumn'), new FloatType()],
 			])),
 			'

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -378,7 +378,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, true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -400,7 +400,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, true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -421,7 +421,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, true)],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -531,7 +531,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, true)],
 			]),
 			'
 				SELECT		o, o.id