fix reconciliation between a list and iterable

orklah · Jun 22, 2023 · ed5419e · ed5419e
1 parent 2e8d575
commit ed5419e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/AssertionReconciler.php b/src/Psalm/Internal/Type/AssertionReconciler.php
@@ -777,6 +777,7 @@ private static function filterAtomicWithAnother(
             unset($type_1_param);
 
             $matching_atomic_type = $type_1_atomic->setProperties($type_1_properties);
+            $matching_atomic_type->fallback_params[1] = $type_2_param;//any fallback type is now the value of iterable
             $atomic_comparison_results->type_coerced = true;
         }
 

diff --git a/tests/TypeReconciliation/ReconcilerTest.php b/tests/TypeReconciliation/ReconcilerTest.php
@@ -179,6 +179,7 @@ public function providerTestReconcilation(): array
             'IsNotAClassReconciliation' => ['int', new Assertion\IsNotAClass(new TNamedObject('IDObject'), true), 'int|IDObject'],
             'nonEmptyArray' => ['non-empty-array<array-key, mixed>', new IsType(Atomic::create('non-empty-array')), 'array'],
             'nonEmptyList' => ['non-empty-list<mixed>', new IsType(Atomic::create('non-empty-list')), 'array'],
+            'ListOfInts' => ['list<int>', new IsType(Atomic::create('iterable<int>')), 'list<mixed>'],
         ];
     }