Use appropriate template types when applying array_filter asssertions

Fixes #3008
vimeo · Mar 24, 2020 · cae15b6 · cae15b6
1 parent 25bd2ed
commit cae15b6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayFilterReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayFilterReturnTypeProvider.php
@@ -203,7 +203,7 @@ function (\Psalm\Storage\FunctionLikeParameter $param) {
                                 $changed_var_ids,
                                 ['$inner_type' => true],
                                 $statements_source,
-                                [],
+                                $statements_source->getTemplateTypeMap(),
                                 false,
                                 new CodeLocation($statements_source, $stmt)
                             );

diff --git a/tests/Template/FunctionClassStringTemplateTest.php b/tests/Template/FunctionClassStringTemplateTest.php
@@ -649,6 +649,26 @@ function bar(string $e, string $expected) : void {
                         if ($e !== $expected) {}
                     }',
             ],
+            'refineByArrayFilterIntersection' => [
+                '<?php
+                    /**
+                     * @template T
+                     * @param array<Bar> $bars
+                     * @psalm-param class-string<T> $class
+                     * @return array<T&Bar>
+                     */
+                    function getBarsThatAreInstancesOf(array $bars, string $class): array
+                    {
+                        return \array_filter(
+                            $bars,
+                            function (Bar $bar) use ($class): bool {
+                                return $bar instanceof $class;
+                            }
+                        );
+                    }
+
+                    interface Bar {}'
+            ],
         ];
     }