Fix #5198 - allow is_array check on templated

vimeo · Feb 12, 2021 · fa33737 · fa33737
1 parent c9ff1ee
commit fa33737
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -1658,7 +1658,7 @@ private static function reconcileArray(
 
                 $did_remove_type = true;
             } elseif ($type instanceof TTemplateParam) {
-                if ($type->as->hasArray() || $type->as->hasMixed()) {
+                if ($type->as->hasArray() || $type->as->hasIterable() || $type->as->hasMixed()) {
                     $type = clone $type;
 
                     $type->as = self::reconcileArray(

diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
@@ -580,6 +580,11 @@ public function hasArray(): bool
         return isset($this->types['array']);
     }
 
+    public function hasIterable(): bool
+    {
+        return isset($this->types['iterable']);
+    }
+
     public function hasList(): bool
     {
         return isset($this->types['array']) && $this->types['array'] instanceof Atomic\TList;

diff --git a/tests/Template/FunctionTemplateTest.php b/tests/Template/FunctionTemplateTest.php
@@ -1508,6 +1508,17 @@ public function get($default)
                         }
                     }'
             ],
+            'isArrayCheckOnTemplated' => [
+                '<?php
+                    /**
+                     * @psalm-pure
+                     * @template TIterable of iterable
+                     */
+                    function toList(iterable $iterable): void
+                    {
+                        if (is_array($iterable)) {}
+                    }'
+            ],
         ];
     }