Generated types

Author: vudaltsov

generator/types.php

@@ -13,14 +13,12 @@
     type('null', 'null'),
     type('false', 'false'),
     type('true', 'true'),
-    type('intValue', 'int')->prop('value', 'int'),
-    type('floatValue', 'float')->prop('value', 'float'),
+    type('intRange', 'int')->prop('min', '?int')->prop('max', '?int'),
+    type('floatRange', 'float')->prop('min', '?float')->prop('max', '?float'),
     type('stringValue', 'string')->prop('value', 'string'),
     type('string', 'string'),
     type('resource', 'resource'),
     // compound
-    type('intRange', 'int')->prop('minType', 'Type<int>')->prop('maxType', 'Type<int>'),
-    type('floatRange', 'float')->prop('minType', 'Type<float>')->prop('maxType', 'Type<float>'),
     type('union', 'mixed')->prop('types', 'non-empty-list<Type>'),
     type('intersection', 'mixed')->prop('types', 'non-empty-list<Type>'),
     type('diff', 'mixed')->prop('minuend', 'Type')->prop('subtrahend', 'Type'),

src/Alias/FloatMaxT.php

@@ -20,7 +20,7 @@ enum FloatT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var FloatRangeT */
-        static $type = new FloatRangeT(FloatMinT::T, FloatMaxT::T);
+        static $type = new FloatRangeT(null, null);
 
         return $visitor->floatRange($type);
     }

src/Alias/FloatMinT.php

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

src/Alias/FloatT.php

@@ -5,7 +5,6 @@
 namespace Typhoon\Type\Alias;
 
 use Typhoon\Type\IntRangeT;
-use Typhoon\Type\IntValueT;
 use Typhoon\Type\Type;
 use Typhoon\Type\TypeVisitor;
 
@@ -21,7 +20,7 @@ enum NegativeIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(IntMinT::T, new IntValueT(-1));
+        static $type = new IntRangeT(null, -1);
 
         return $visitor->intRange($type);
     }

src/Alias/IntMaxT.php

@@ -5,7 +5,6 @@
 namespace Typhoon\Type\Alias;
 
 use Typhoon\Type\IntRangeT;
-use Typhoon\Type\IntValueT;
 use Typhoon\Type\Type;
 use Typhoon\Type\TypeVisitor;
 
@@ -21,7 +20,7 @@ enum NonNegativeIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(new IntValueT(0), IntMaxT::T);
+        static $type = new IntRangeT(0, null);
 
         return $visitor->intRange($type);
     }

src/Alias/IntMinT.php

@@ -5,7 +5,6 @@
 namespace Typhoon\Type\Alias;
 
 use Typhoon\Type\IntRangeT;
-use Typhoon\Type\IntValueT;
 use Typhoon\Type\Type;
 use Typhoon\Type\TypeVisitor;
 
@@ -21,7 +20,7 @@ enum NonPositiveIntT implements Type
     public function accept(TypeVisitor $visitor): mixed
     {
         /** @var IntRangeT */
-        static $type = new IntRangeT(IntMinT::T, new IntValueT(0));
+        static $type = new IntRangeT(null, 0);
 
         return $visitor->intRange($type);
     }