New types: decimal-int-string and non-decimal-int-string

Author: ondrejmirtes

phpstan-baseline.neon

@@ -777,6 +777,12 @@ parameters:
 			count: 1
 			path: src/Type/Accessory/AccessoryArrayListType.php
 
+		-
+			rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Type/Accessory/AccessoryDecimalIntegerStringType.php
+
 		-
 			rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
 			identifier: phpstanApi.instanceofType
@@ -1716,7 +1722,7 @@ parameters:
 		-
 			rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 4
 			path: src/Type/TypeCombinator.php
 
 		-

src/PhpDoc/TypeNodeResolver.php

@@ -47,6 +47,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryDecimalIntegerStringType;
 use PHPStan\Type\Accessory\AccessoryLiteralStringType;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
@@ -235,6 +236,15 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 			case 'string':
 				return new StringType();
 
+			case 'decimal-int-string':
+				return new IntersectionType([new StringType(), new AccessoryDecimalIntegerStringType()]);
+
+			case 'non-decimal-int-string':
+				return new IntersectionType([
+					new StringType(),
+					new AccessoryDecimalIntegerStringType(inverse: true),
+				]);
+
 			case 'lowercase-string':
 				return new IntersectionType([new StringType(), new AccessoryLowercaseStringType()]);
 

src/Type/Accessory/AccessoryArrayListType.php

@@ -385,6 +385,11 @@ public function isNumericString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isDecimalIntegerString(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isNonEmptyString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();