Use DecimalIntString over NumericString

Author: VincentLanglet

src/Type/Constant/ConstantStringType.php

@@ -19,6 +19,7 @@
 use PHPStan\Reflection\TrivialParametersAcceptor;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryDecimalIntegerStringType;
 use PHPStan\Type\Accessory\AccessoryLiteralStringType;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
@@ -459,7 +460,9 @@ public function generalize(GeneralizePrecision $precision): Type
 				new AccessoryLiteralStringType(),
 			];
 
-			if (is_numeric($this->getValue())) {
+			if ((string) (int) $this->getValue() === $this->getValue()) {
+				$accessories[] = new AccessoryDecimalIntegerStringType();
+			} elseif (is_numeric($this->getValue())) {
 				$accessories[] = new AccessoryNumericStringType();
 			}
 

src/Type/IntegerRangeType.php

@@ -10,9 +10,9 @@
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryDecimalIntegerStringType;
 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;
@@ -509,7 +509,7 @@ public function toString(): Type
 				new StringType(),
 				new AccessoryLowercaseStringType(),
 				new AccessoryUppercaseStringType(),
-				new AccessoryNumericStringType(),
+				new AccessoryDecimalIntegerStringType(),
 				new AccessoryNonFalsyStringType(),
 			]);
 		}
@@ -518,7 +518,7 @@ public function toString(): Type
 			new StringType(),
 			new AccessoryLowercaseStringType(),
 			new AccessoryUppercaseStringType(),
-			new AccessoryNumericStringType(),
+			new AccessoryDecimalIntegerStringType(),
 		]);
 	}
 

src/Type/IntegerType.php

@@ -6,8 +6,8 @@
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryDecimalIntegerStringType;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
@@ -78,7 +78,7 @@ public function toString(): Type
 			new StringType(),
 			new AccessoryLowercaseStringType(),
 			new AccessoryUppercaseStringType(),
-			new AccessoryNumericStringType(),
+			new AccessoryDecimalIntegerStringType(),
 		]);
 	}