Add non-empty-list support

vimeo · Oct 9, 2019 · 51cfd55 · 51cfd55
1 parent 6a07757
commit 51cfd55
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayFilterReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayFilterReturnTypeProvider.php
@@ -8,6 +8,7 @@
 use PhpParser;
 use Psalm\CodeLocation;
 use Psalm\Context;
+use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Internal\Analyzer\Statements\Expression\AssertionFinder;
 use Psalm\Internal\Codebase\CallMap;
 use Psalm\Issue\InvalidReturnType;
@@ -61,8 +62,18 @@ public static function getFunctionReturnType(
         }
 
         if (!isset($call_args[1])) {
-            $inner_type->removeType('null');
-            $inner_type->removeType('false');
+            if ($statements_source instanceof StatementsAnalyzer) {
+                $inner_type = \Psalm\Internal\Type\AssertionReconciler::reconcile(
+                    '!falsy',
+                    clone $inner_type,
+                    '',
+                    $statements_source,
+                    $context->inside_loop,
+                    [],
+                    null,
+                    $statements_source->getSuppressedIssues()
+                );
+            }
         } elseif (!isset($call_args[2])) {
             $function_call_arg = $call_args[1];
 

diff --git a/src/Psalm/Type.php b/src/Psalm/Type.php
@@ -106,6 +106,7 @@ abstract class Type
         'value-of' => true,
         'non-empty-countable' => true,
         'list' => true,
+        'non-empty-list' => true,
     ];
 
     /**