Fix taint regression

vimeo · Jun 20, 2020 · 8edee96 · 8edee96
1 parent 80ed1da
commit 8edee96
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -1243,18 +1243,22 @@ function (Assertion $assertion) use ($generic_params) : Assertion {
                     ) {
                         $code_location = new CodeLocation($statements_analyzer->getSource(), $stmt);
 
+                        $method_location = $method_storage
+                            ? ($method_storage->signature_return_type_location ?: $method_storage->location)
+                            : null;
+
                         if ($method_storage && $method_storage->pure) {
                             $method_source = TaintNode::getForMethodReturn(
                                 (string) $method_id,
                                 $cased_method_id,
-                                $code_location,
+                                $method_location,
                                 $code_location
                             );
                         } else {
                             $method_source = TaintNode::getForMethodReturn(
                                 (string) $method_id,
                                 $cased_method_id,
-                                $code_location
+                                $method_location
                             );
                         }