Fix #3654 - use correct function id for namespaced functions

vimeo · Jun 23, 2020 · 96d05ab · 96d05ab
1 parent 6a746b6
commit 96d05ab
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -324,11 +324,10 @@ public function analyze(
                 $context->calling_method_id = strtolower((string) $method_id);
             }
         } elseif ($this->function instanceof Function_) {
-            $cased_method_id = $this->function->name->name;
+            $function_name = $this->function->name->name;
             $namespace_prefix = $this->getNamespace();
-            $context->calling_function_id = strtolower(
-                ($namespace_prefix !== null ? $namespace_prefix . '\\' : '') . $cased_method_id
-            );
+            $cased_method_id = ($namespace_prefix !== null ? $namespace_prefix . '\\' : '') . $function_name;
+            $context->calling_function_id = strtolower($cased_method_id);
         } else { // Closure
             if ($storage->return_type) {
                 $closure_return_type = \Psalm\Internal\Type\TypeExpander::expandUnion(

diff --git a/tests/TaintTest.php b/tests/TaintTest.php
@@ -1856,4 +1856,26 @@ public function testEncapsulatedString() : void
 
         $this->analyzeFile('somefile.php', new Context());
     }
+
+    public function testNamespacedFunction() : void
+    {
+        $this->expectException(\Psalm\Exception\CodeException::class);
+        $this->expectExceptionMessage('TaintedInput');
+
+        $this->project_analyzer->trackTaintedInputs();
+
+        $this->addFile(
+            'somefile.php',
+            '<?php
+                namespace ns;
+
+                function identity(string $s) : string {
+                    return $s;
+                }
+
+                echo identity($_GET[\'userinput\']);'
+        );
+
+        $this->analyzeFile('somefile.php', new Context());
+    }
 }