Fix reconciliation of mixed to Traversable

vimeo · Aug 18, 2019 · b8bdaea · b8bdaea
1 parent 1b983ba
commit b8bdaea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/AssertionReconciler.php b/src/Psalm/Internal/Type/AssertionReconciler.php
@@ -1298,7 +1298,7 @@ private static function reconcileTraversable(
         $existing_var_atomic_types = $existing_var_type->getTypes();
 
         if ($existing_var_type->hasMixed() || $existing_var_type->hasTemplate()) {
-            return new Type\Union([new Type\Atomic\TIterable]);
+            return new Type\Union([new Type\Atomic\TNamedObject('Traversable')]);
         }
 
         $traversable_types = [];

diff --git a/tests/TypeReconciliationTest.php b/tests/TypeReconciliationTest.php
@@ -1458,6 +1458,16 @@ function getBar(SimpleXMLElement $e, string $s) : void {
                         if (isset($e->bar)) {}
                     }',
             ],
+            'assertArrayOffsetToTraversable' => [
+                '<?php
+                    function render(array $data): ?Traversable {
+                        if ($data["o"] instanceof Traversable) {
+                            return $data["o"];
+                        }
+
+                        return null;
+                    }'
+            ],
         ];
     }