isDecimalIntegerString test

Author: ondrejmirtes

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -347,10 +347,6 @@ public function isScalar(): TrinaryLogic
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
-		if ($type->isString()->yes() && $type->isNonFalsyString()->no()) {
-			return new ConstantBooleanType(false);
-		}
-
 		$falseyTypes = StaticTypeFactory::falsey();
 		if ($falseyTypes->isSuperTypeOf($type)->yes()) {
 			return new ConstantBooleanType(false);

src/Type/ArrayType.php

@@ -12,7 +12,6 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
-use PHPStan\Type\Accessory\AccessoryDecimalIntegerStringType;
 use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -52,15 +51,11 @@ class ArrayType implements Type
 	/** @api */
 	public function __construct(Type $keyType, private Type $itemType)
 	{
-		$desc = $keyType->describe(VerbosityLevel::value());
-		if (in_array($desc, ['(int|string)', '(int|non-decimal-int-string)'], true)) {
+		if ($keyType->describe(VerbosityLevel::value()) === '(int|string)') {
 			$keyType = new MixedType();
 		}
 		if ($keyType instanceof StrictMixedType && !$keyType instanceof TemplateStrictMixedType) {
-			$keyType = new UnionType([
-				new StringType(),
-				new IntegerType(),
-			]);
+			$keyType = new UnionType([new StringType(), new IntegerType()]);
 		}
 
 		$this->keyType = $keyType;
@@ -121,7 +116,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 	{
 		if ($type instanceof self || $type instanceof ConstantArrayType) {
 			return $this->getItemType()->isSuperTypeOf($type->getItemType())
-				->and($this->getKeyType()->isSuperTypeOf($type->getKeyType()));
+				->and($this->getIterableKeyType()->isSuperTypeOf($type->getIterableKeyType()));
 		}
 
 		if ($type instanceof CompoundType) {
@@ -206,10 +201,10 @@ public function getIterableKeyType(): Type
 	{
 		$keyType = $this->keyType;
 		if ($keyType instanceof MixedType && !$keyType instanceof TemplateMixedType) {
-			return new BenevolentUnionType([new IntegerType(), new IntersectionType([new StringType(), new AccessoryDecimalIntegerStringType(inverse: true)])]);
+			return new BenevolentUnionType([new IntegerType(), new StringType()]);
 		}
 		if ($keyType instanceof StrictMixedType) {
-			return new BenevolentUnionType([new IntegerType(), new IntersectionType([new StringType(), new AccessoryDecimalIntegerStringType(inverse: true)])]);
+			return new BenevolentUnionType([new IntegerType(), new StringType()]);
 		}
 
 		return $keyType;

src/Type/Constant/ConstantStringType.php

@@ -331,7 +331,7 @@ public function isNumericString(): TrinaryLogic
 
 	public function isDecimalIntegerString(): TrinaryLogic
 	{
-		return parent::isDecimalIntegerString();
+		return TrinaryLogic::createFromBoolean((string) (int) $this->value === $this->value);
 	}
 
 	public function isNonEmptyString(): TrinaryLogic

tests/PHPStan/Type/Constant/ConstantStringTypeTest.php

@@ -185,6 +185,63 @@ public function testSetInvalidValue(): void
 		$this->assertInstanceOf(ErrorType::class, $result);
 	}
 
-	public function test
+	public static function dataIsDecimalIntegerString(): iterable
+	{
+		yield [
+			'0',
+			TrinaryLogic::createYes(),
+		];
+		yield [
+			'1',
+			TrinaryLogic::createYes(),
+		];
+		yield [
+			'1234',
+			TrinaryLogic::createYes(),
+		];
+		yield [
+			'-1',
+			TrinaryLogic::createYes(),
+		];
+		yield [
+			'+1',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'00',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'01',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'18E+3',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'1.2',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'1,3',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'foo',
+			TrinaryLogic::createNo(),
+		];
+		yield [
+			'1foo',
+			TrinaryLogic::createNo(),
+		];
+	}
+
+	#[DataProvider('dataIsDecimalIntegerString')]
+	public function testIsDecimalIntegerString(string $value, TrinaryLogic $expected): void
+	{
+		$type = new ConstantStringType($value);
+		$this->assertSame($expected->describe(), $type->isDecimalIntegerString()->describe());
+	}
 
 }