Improve internals of TIntRange (#6208)

* Improve internals of TIntRange * fix PositiveInt aliasing
vimeo · Jul 31, 2021 · 7e137f5 · 7e137f5
1 parent c62adf9
commit 7e137f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/IntegerRangeComparator.php b/src/Psalm/Internal/Type/Comparator/IntegerRangeComparator.php
@@ -13,10 +13,10 @@ public static function isContainedBy(
         TIntRange $input_type_part,
         TIntRange $container_type_part
     ) : bool {
-        $is_input_min = $input_type_part->min_bound === TIntRange::BOUND_MIN;
-        $is_input_max = $input_type_part->max_bound === TIntRange::BOUND_MAX;
-        $is_container_min = $container_type_part->min_bound === TIntRange::BOUND_MIN;
-        $is_container_max = $container_type_part->max_bound === TIntRange::BOUND_MAX;
+        $is_input_min = $input_type_part->min_bound === null;
+        $is_input_max = $input_type_part->max_bound === null;
+        $is_container_min = $container_type_part->min_bound === null;
+        $is_container_max = $container_type_part->max_bound === null;
 
         $is_input_min_in_container = (
                 $is_container_min ||

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -784,9 +784,6 @@ private static function getTypeFromGenericTree(
                 throw new TypeParseTreeException('int range must have 2 params');
             }
 
-            $min_bound = Atomic\TIntRange::BOUND_MIN;
-            $max_bound = Atomic\TIntRange::BOUND_MAX;
-
             $param0_union_types = array_values($generic_params[0]->getAtomicTypes());
             $param1_union_types = array_values($generic_params[1]->getAtomicTypes());
 
@@ -805,19 +802,20 @@ private static function getTypeFromGenericTree(
                 throw new TypeParseTreeException("max bound for int range param can't be 'min'");
             }
 
-
+            $min_bound = null;
+            $max_bound = null;
             if ($param0_union_types[0] instanceof TLiteralInt) {
                 $min_bound = $param0_union_types[0]->value;
             }
             if ($param1_union_types[0] instanceof TLiteralInt) {
                 $max_bound = $param1_union_types[0]->value;
             }
 
-            if ($min_bound === TIntRange::BOUND_MIN && $max_bound === TIntRange::BOUND_MAX) {
+            if ($min_bound === null && $max_bound === null) {
                 return new Atomic\TInt();
             }
 
-            if ($min_bound === 0 && $max_bound === TIntRange::BOUND_MAX) {
+            if ($min_bound === 1 && $max_bound === null) {
                 return new Atomic\TPositiveInt();
             }
 

diff --git a/src/Psalm/Type/Atomic/TIntRange.php b/src/Psalm/Type/Atomic/TIntRange.php
@@ -10,21 +10,15 @@ class TIntRange extends TInt
     const BOUND_MAX = 'max';
 
     /**
-     * @var int|string
-     * @psalm-var int|'min'
+     * @var int|null
      */
     public $min_bound;
     /**
-     * @var int|string
-     * @var int|'max'
+     * @var int|null
      */
     public $max_bound;
 
-    /**
-     * @param int|self::BOUND_MIN $min_bound
-     * @param int|self::BOUND_MAX $max_bound
-     */
-    public function __construct($min_bound, $max_bound)
+    public function __construct(?int $min_bound, ?int $max_bound)
     {
         $this->min_bound = $min_bound;
         $this->max_bound = $max_bound;
@@ -37,7 +31,7 @@ public function __toString(): string
 
     public function getKey(bool $include_extra = true): string
     {
-        return 'int<' . $this->min_bound . ', ' . $this->max_bound . '>';
+        return 'int<' . ($this->min_bound ?? 'min') . ', ' . ($this->max_bound ?? 'max') . '>';
     }
 
     public function canBeFullyExpressedInPhp(int $php_major_version, int $php_minor_version): bool
@@ -67,11 +61,13 @@ public function toNamespacedString(
         ?string $this_class,
         bool $use_phpdoc_format
     ): string {
-        return $use_phpdoc_format ? 'int' : 'int<' . $this->min_bound . ', ' . $this->max_bound . '>';
+        return $use_phpdoc_format ?
+            'int' :
+            'int<' . ($this->min_bound ?? 'min') . ', ' . ($this->max_bound ?? 'max') . '>';
     }
 
     public function isPositive(): bool
     {
-        return $this->min_bound !== self::BOUND_MIN && $this->min_bound > 0;
+        return $this->min_bound !== null && $this->min_bound > 0;
     }
 }