Fix #4274 - don’t ignore mixed union in array_shift operation

vimeo · Oct 12, 2020 · 662e2ea · 662e2ea
1 parent dfa8854
commit 662e2ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayPopReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayPopReturnTypeProvider.php
@@ -33,6 +33,7 @@ public static function getFunctionReturnType(
         $first_arg_array = $first_arg
             && ($first_arg_type = $statements_source->node_data->getType($first_arg))
             && $first_arg_type->hasType('array')
+            && !$first_arg_type->hasMixed()
             && ($array_atomic_type = $first_arg_type->getAtomicTypes()['array'])
             && ($array_atomic_type instanceof Type\Atomic\TArray
                 || $array_atomic_type instanceof Type\Atomic\ObjectLike

diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -1848,6 +1848,17 @@ function thing() {
                     $list = array_filter($list);
                     if (!empty($list)) {}'
             ],
+            'arrayShiftOnMixedOrEmptyArray' => [
+                '<?php
+                    /**
+                     * @param mixed|array<empty, empty> $lengths
+                     */
+                    function doStuff($lengths): void {
+                        /** @psalm-suppress MixedArgument, MixedAssignment */
+                        $length = array_shift($lengths);
+                        if ($length !== null) {}
+                    }'
+            ],
         ];
     }