Merge pull request #7583 from AndrolGenhald/bugfix/7580

vimeo · Feb 4, 2022 · 333f148 · 333f148
2 parents 438a80d + 5b469ca
commit 333f148
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -929,6 +929,12 @@ public static function analyzeAssignmentRef(
             return false;
         }
 
+        if (!isset($context->vars_in_scope[$rhs_var_id])) {
+            // Sometimes the $rhs_var_id isn't set in $vars_in_scope, for example if it's an unknown array offset.
+            $context->vars_in_scope[$rhs_var_id] = $statements_analyzer->node_data->getType($stmt->expr)
+                ?? Type::getMixed();
+        }
+
         if (isset($context->references_in_scope[$lhs_var_id])) {
             // Decrement old referenced variable's reference count
             $reference_count = &$context->referenced_counts[$context->references_in_scope[$lhs_var_id]];

diff --git a/tests/ReferenceTest.php b/tests/ReferenceTest.php
@@ -218,6 +218,35 @@ function &ensure_array(array &$what, array $keys): array
                     }
                 ',
             ],
+            'dontCrashOnReferenceToMixedVariableArrayOffset' => [
+                'code' => '<?php
+                    function func(&$a): void
+                    {
+                        $_ = &$a["f"];
+                    }
+                ',
+                'assertions' => [],
+                'ignored_issues' => ['MixedArrayAccess', 'MissingParamType'],
+            ],
+            'dontCrashOnReferenceToArrayUnknownOffset' => [
+                'code' => '<?php
+                    function func(array &$a): void
+                    {
+                        $_ = &$a["f"];
+                    }
+                ',
+                'assertions' => [],
+            ],
+            'dontCrashOnReferenceToArrayMixedOffset' => [
+                'code' => '<?php
+                    /** @param array{f: mixed} $a */
+                    function func(array &$a): void
+                    {
+                        $_ = &$a["f"];
+                    }
+                ',
+                'assertions' => [],
+            ],
         ];
     }