Mark variables in throw arguments as used (#5166)

Fixes #5164
vimeo · Feb 7, 2021 · b72c5a0 · b72c5a0
1 parent d740c16
commit b72c5a0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php
@@ -425,7 +425,8 @@ private static function addDataFlowToVariable(
             && ($context->inside_call
                 || $context->inside_conditional
                 || $context->inside_use
-                || $context->inside_isset)
+                || $context->inside_isset
+                || $context->inside_throw)
         ) {
             if (!$stmt_type->parent_nodes) {
                 $assignment_node = DataFlowNode::getForAssignment(

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -2300,6 +2300,23 @@ function takesResults(array $arr) : void {
                         }
                     }'
             ],
+            'usedThrow' => [
+                '<?php
+                    function f(Exception $e): void {
+                        throw $e;
+                    }
+                ',
+            ],
+            'usedThrowInReturnedCallable' => [
+                '<?php
+                    function createFailingFunction(RuntimeException $exception): Closure
+                    {
+                        return static function () use ($exception): void {
+                            throw $exception;
+                        };
+                    }
+                ',
+            ]
         ];
     }