Update typhoon/type

Author: vudaltsov

composer.lock

@@ -40,7 +40,10 @@
 use const Typhoon\Type\nonEmptyStringT;
 use const Typhoon\Type\nonNegativeIntT;
 use const Typhoon\Type\nonPositiveIntT;
+use const Typhoon\Type\nonZeroIntT;
 use const Typhoon\Type\nullT;
+use const Typhoon\Type\numericStringT;
+use const Typhoon\Type\numericT;
 use const Typhoon\Type\positiveIntT;
 use const Typhoon\Type\resourceT;
 use const Typhoon\Type\scalarT;
@@ -116,12 +119,14 @@ private function parseIdentifier(string $name, array $genericNodes = []): Type
             'negative-int' => negativeIntT,
             'non-negative-int' => nonNegativeIntT,
             'non-positive-int' => nonPositiveIntT,
-            'non-zero-int' => orT(negativeIntT, positiveIntT),
+            'non-zero-int' => nonZeroIntT,
             'float' => self::parseFloat(...),
-            'string' => stringT,
             'non-empty-string' => nonEmptyStringT,
+            'numeric-string' => numericStringT,
+            'string' => stringT,
             'resource' => resourceT,
             'array-key' => arrayKeyT,
+            'numeric' => numericT,
             'scalar' => scalarT,
             'mixed' => mixedT,
         ];

src/Internal/ContextualTypeParser.php

@@ -29,7 +29,10 @@
 use const Typhoon\Type\nonEmptyStringT;
 use const Typhoon\Type\nonNegativeIntT;
 use const Typhoon\Type\nonPositiveIntT;
+use const Typhoon\Type\nonZeroIntT;
 use const Typhoon\Type\nullT;
+use const Typhoon\Type\numericStringT;
+use const Typhoon\Type\numericT;
 use const Typhoon\Type\positiveIntT;
 use const Typhoon\Type\resourceT;
 use const Typhoon\Type\scalarT;
@@ -60,7 +63,7 @@ private static function cases(): \Generator
         yield 'negative-int' => negativeIntT;
         yield 'non-positive-int' => nonPositiveIntT;
         yield 'non-negative-int' => nonNegativeIntT;
-        yield 'non-zero-int' => orT(negativeIntT, positiveIntT);
+        yield 'non-zero-int' => nonZeroIntT;
         yield 'int<0, 1>' => intRangeT(0, 1);
         yield 'int<-10, -23>' => intRangeT(-10, -23);
         yield 'int<min, 123>' => intRangeT(max: 123);
@@ -80,10 +83,12 @@ private static function cases(): \Generator
         yield '"str"' => stringT('str');
         yield "'str'" => stringT('str');
         yield "'\\n'" => stringT('\n');
-        yield 'string' => stringT;
         yield 'non-empty-string' => nonEmptyStringT;
+        yield 'numeric-string' => numericStringT;
+        yield 'string' => stringT;
         yield 'resource' => resourceT;
         yield 'array-key' => arrayKeyT;
+        yield 'numeric' => numericT;
         yield 'scalar' => scalarT;
         yield 'int|string' => orT(intT, stringT);
         yield '(int|string)|float' => orT(orT(intT, stringT), floatT);

tests/PHPStanTypeParserTest.php

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "phpstan/phpstan": "^2.1.8"
+        "phpstan/phpstan": "^2.1.11"
     },
     "config": {
         "bump-after-update": "dev",