Sync with template

Author: vudaltsov

generator/TypeSpec.php

@@ -109,10 +109,10 @@ public function nativeType(): string
         }
 
         return ($nullable ? '?' : '') . match ($container) {
+            'numeric-string', 'non-empty-string', 'class-string' => 'string',
+            'list', 'non-empty-list' => 'array',
             'Variance' => Variance::class,
             'Type' => Type::class,
-            'list', 'non-empty-list' => 'array',
-            'non-empty-string', 'class-string' => 'string',
             default => $container,
         };
     }

generator/types.php

@@ -13,7 +13,7 @@
     type('null', 'null'),
     type('false', 'false'),
     type('true', 'true'),
-    type('intRange', 'int')->prop('min', '?int')->prop('max', '?int'),
+    type('intRange', 'int')->prop('min', '?numeric-string')->prop('max', '?numeric-string'),
     type('floatRange', 'float')->prop('min', '?float')->prop('max', '?float'),
     type('stringValue', 'string')->prop('value', 'string'),
     type('string', 'string'),

src/Alias/NegativeIntT.php

@@ -20,7 +20,7 @@ enum NegativeIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(null, -1);
+        static $type = new IntRangeT(null, '-1');
 
         return $visitor->intRange($type);
     }

src/Alias/NonNegativeIntT.php

@@ -20,7 +20,7 @@ enum NonNegativeIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(0, null);
+        static $type = new IntRangeT('0', null);
 
         return $visitor->intRange($type);
     }

src/Alias/NonPositiveIntT.php

@@ -20,7 +20,7 @@ enum NonPositiveIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(null, 0);
+        static $type = new IntRangeT(null, '0');
 
         return $visitor->intRange($type);
     }

src/Alias/PositiveIntT.php

@@ -20,7 +20,7 @@ enum PositiveIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(1, null);
+        static $type = new IntRangeT('1', null);
 
         return $visitor->intRange($type);
     }

src/IntRangeT.php

@@ -12,15 +12,19 @@
  */
 final class IntRangeT implements Type
 {
-    public readonly ?int $min;
+    /** @var ?numeric-string */
+    public readonly ?string $min;
 
-    public readonly ?int $max;
+    /** @var ?numeric-string */
+    public readonly ?string $max;
 
     /**
      * @internal
      * @psalm-internal Typhoon\Type
+     * @param ?numeric-string $min
+     * @param ?numeric-string $max
      */
-    public function __construct(?int $min, ?int $max)
+    public function __construct(?string $min, ?string $max)
     {
         $this->min = $min;
         $this->max = $max;

src/types.php

@@ -34,20 +34,28 @@
 
 /**
  * @api
+ * @param int|numeric-string $value
  * @return Type<int>
  */
-function intT(int $value): Type
+function intT(int|string $value): Type
 {
+    $value = (string) $value;
+
     return new IntRangeT($value, $value);
 }
 
 /**
  * @api
+ * @param null|int|numeric-string $min
+ * @param null|int|numeric-string $max
  * @return Type<int>
  */
-function intRangeT(?int $min = null, ?int $max = null): Type
+function intRangeT(null|int|string $min = null, null|int|string $max = null): Type
 {
-    return new IntRangeT($min, $max);
+    return new IntRangeT(
+        $min === null ? null : (string) $min,
+        $max === null ? null : (string) $max,
+    );
 }
 
 const negativeIntT = NegativeIntT::T;