Improve byref array handling

vimeo · Feb 7, 2020 · 966336a · 966336a
1 parent da541db
commit 966336a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
@@ -430,9 +430,7 @@ protected static function checkFunctionArguments(
                         return false;
                     }
 
-                    if ($arg->value instanceof PhpParser\Node\Expr\Variable) {
-                        continue;
-                    }
+                    continue;
                 }
 
                 $toggled_class_exists = false;
@@ -819,6 +817,12 @@ private static function handleByRefFunctionArg(
                 return false;
             }
         }
+
+        if (!$arg->value instanceof PhpParser\Node\Expr\Variable) {
+            if (ExpressionAnalyzer::analyze($statements_analyzer, $arg->value, $context) === false) {
+                return false;
+            }
+        }
     }
 
     /**

diff --git a/tests/ArrayAccessTest.php b/tests/ArrayAccessTest.php
@@ -874,6 +874,27 @@ function foo(array $arr) : void {
                         echo $arr[3] ?? null;
                     }',
             ],
+            'destructureMixed' => [
+                '<?php
+                    class S {
+                        protected array $a = [];
+                        protected array $b = [];
+                        protected array $c = [];
+
+                        /**
+                         * @psalm-suppress MixedAssignment
+                         */
+                        public function pop(): void {
+                            if (!$this->a) {
+                                return;
+                            }
+
+                            $popped = array_pop($this->a);
+
+                            [$this->b, $this->c] = $popped;
+                        }
+                    }'
+            ],
         ];
     }