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

replace array<never, never> as a way to detect empty arrays by a dedicated method

Browse Source
This commit is contained in:
orklah 2022-01-05 23:14:54 +01:00
parent f5dc2ee964
commit 3c468b3eeb
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -503,7 +503,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
&& !$inferred_return_type->isSingleIntLiteral()
&& !$inferred_return_type->isSingleStringLiteral()
&& !$inferred_return_type->isTrue()
&& $inferred_return_type->getId() !== 'array<never, never>'
&& !$inferred_return_type->isEmptyArray()
) {
$manipulator->makePure();
}

2
src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
View File

@ -1024,7 +1024,7 @@ class AssignmentAnalyzer
$by_ref_out_type->parent_nodes += $existing_type->parent_nodes;
}
if ($existing_type->getId() !== 'array<never, never>') {
if (!$existing_type->isEmptyArray()) {
$context->vars_in_scope[$var_id] = $by_ref_out_type;
if (!($stmt_type = $statements_analyzer->node_data->getType($stmt))

2
src/Psalm/Internal/Type/SimpleAssertionReconciler.php
View File

@ -554,7 +554,7 @@ class SimpleAssertionReconciler extends Reconciler
if (!$array_atomic_type instanceof TNonEmptyArray
|| ($array_atomic_type->count < $min_count)
) {
if ($array_atomic_type->getId() === 'array<never, never>') {
if (!$array_atomic_type->isEmptyArray()) {
$existing_var_type->removeType('array');
} else {
$non_empty_array = new TNonEmptyArray(

2
src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
View File

@ -486,7 +486,7 @@ class SimpleNegatedAssertionReconciler extends Reconciler
$did_remove_type = true;
$existing_var_type->removeType('array');
} elseif ($array_atomic_type->getId() !== 'array<never, never>') {
} elseif (!$array_atomic_type->isEmptyArray()) {
$did_remove_type = true;
if (!$min_count) {

2
src/Psalm/Type/Atomic.php
View File

@ -785,7 +785,7 @@ abstract class Atomic implements TypeNode
return true;
}
if ($this instanceof TArray && $this->getId() === 'array<never, never>') {
if ($this instanceof TArray && $this->isEmptyArray()) {
return true;
}

8
src/Psalm/Type/Union.php
View File

@ -1598,4 +1598,12 @@ class Union implements TypeNode
{
return reset($this->types);
}
public function isEmptyArray(): bool
{
return count($this->types) === 1
&& isset($this->types['array'])
&& $this->types['array'] instanceof TArray
&& $this->types['array']->isEmptyArray();
}
}