Use string & numeric-string for numeric-string

Fixes #9 See: https://github.com/phpstan/phpstan-src/blob/ae432e3fd2370b989e3ccb4990e7d3b8c23662ed/src/Type/Php/CtypeDigitFunctionTypeSpecifyingExtension.php#L55
jbboehr · Sep 13, 2023 · b1dd3a5 · b1dd3a5
1 parent f1a2ab6
commit b1dd3a5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Validation/TypeResolver.php b/src/Validation/TypeResolver.php
@@ -13,6 +13,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\StringType;
 use PHPStan\Type\UnionType;
 
 final class TypeResolver
@@ -153,13 +154,19 @@ private function resolveType(Rule $rule): ?Type\Type
             // We can't use numeric ranges here because laravel doesn't cast it to an integer or float
             "Digits", "DigitsBetween", "Decimal", "MaxDigits", "MinDigits", "MultipleOf",
             "Numeric" => Type\TypeCombinator::union(
-                new AccessoryNumericStringType(),
+                new IntersectionType([
+                    new StringType(),
+                    new AccessoryNumericStringType(),
+                ]),
                 new Type\IntegerType(),
                 new Type\FloatType()
             ),
 
             "Integer" => Type\TypeCombinator::union(
-                new AccessoryNumericStringType(),
+                new IntersectionType([
+                    new StringType(),
+                    new AccessoryNumericStringType(),
+                ]),
                 new Type\IntegerType()
             ),