danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Improve internals of TIntRange (#6208)

Browse Source 
* Improve internals of TIntRange

* fix PositiveInt aliasing
This commit is contained in:
orklah 2021-07-31 15:19:20 +02:00 committed by GitHub
parent c62adf9652
commit 7e137f5b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Type/Comparator/IntegerRangeComparator.php
View File

@ -13,10 +13,10 @@ class IntegerRangeComparator
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 ||

10
src/Psalm/Internal/Type/TypeParser.php
View File

@ -784,9 +784,6 @@ class TypeParser
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,7 +802,8 @@ class TypeParser
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;
}
@ -813,11 +811,11 @@ class TypeParser
$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();
}

20
src/Psalm/Type/Atomic/TIntRange.php
View File

@ -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 @@ class TIntRange extends TInt
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 @@ class TIntRange extends TInt
?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;
}
}