Merge pull request #7313 from orklah/empty-arrays

replace `array<never, never>` as a way to detect empty arrays by a dedicated method
vimeo · Jan 5, 2022 · bf4bf92 · bf4bf92
2 parents 17793d1 + 7f40489
commit bf4bf92
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -503,7 +503,7 @@ public function analyze(
                 && !$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();
             }

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -1024,7 +1024,7 @@ public static function assignByRefParam(
                     $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))

diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -554,7 +554,7 @@ private static function reconcileNonEmptyCountable(
                 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(

diff --git a/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
@@ -486,7 +486,7 @@ private static function reconcileNonEmptyCountable(
                 $did_remove_type = true;
 
                 $existing_var_type->removeType('array');
-            } elseif ($array_atomic_type->getId() !== 'array<never, never>') {
+            } elseif (!($array_atomic_type instanceof TArray && $array_atomic_type->isEmptyArray())) {
                 $did_remove_type = true;
 
                 if (!$min_count) {

diff --git a/src/Psalm/Type/Atomic.php b/src/Psalm/Type/Atomic.php
@@ -785,7 +785,7 @@ public function isFalsy(): bool
             return true;
         }
 
-        if ($this instanceof TArray && $this->getId() === 'array<never, never>') {
+        if ($this instanceof TArray && $this->isEmptyArray()) {
             return true;
         }
 

diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
@@ -1598,4 +1598,12 @@ public function getSingleAtomic(): Atomic
     {
         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();
+    }
 }