From cf559bc9f4ba94990470ca90af59a984997de75c Mon Sep 17 00:00:00 2001
From: tianfenghan <rango@swoole.com>
Date: Fri, 31 Jul 2026 17:55:13 +0800
Subject: [PATCH] fix(resolver): distinguish functions from colliding methods

---
 .../code/function-method-symbol-collision.php   | 17 +++++++++++++++++
 phpunit/src/FunctionTest.php                    | 15 +++++++++++++++
 src/CompilerBase.php                            |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 phpunit/code/function-method-symbol-collision.php

diff --git a/phpunit/code/function-method-symbol-collision.php b/phpunit/code/function-method-symbol-collision.php
new file mode 100644
index 00000000..03ff57f4
--- /dev/null
+++ b/phpunit/code/function-method-symbol-collision.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Collision {
+    class Worker
+    {
+        public function validate(array $data = []): void
+        {
+        }
+    }
+}
+
+namespace Collision\Worker {
+    function invoke_validate(mixed $validater): mixed
+    {
+        return validate($validater);
+    }
+}
diff --git a/phpunit/src/FunctionTest.php b/phpunit/src/FunctionTest.php
index 680c26cb..3228438c 100644
--- a/phpunit/src/FunctionTest.php
+++ b/phpunit/src/FunctionTest.php
@@ -2,6 +2,21 @@
 
 class FunctionTest extends \BaseTest
 {
+    public function testFunctionCallDoesNotResolveCollidingClassMethodSymbol(): void
+    {
+        global $translator;
+        $compiler = \TypePhp\CompilerTest::create(ROOT_PATH);
+        $translator = $compiler;
+        $testFile = __DIR__ . '/../code/function-method-symbol-collision.php';
+        $compiler->addFiles([$testFile]);
+        $compiler->prepareFile($testFile);
+        $cppFile = $compiler->convertFile($testFile);
+        $cpp = file_get_contents($cppFile);
+
+        $this->assertStringContainsString('php::call(', $cpp);
+        $this->assertStringNotContainsString('php_collision__worker__validate(validater)', $cpp);
+    }
+
     public function testReturnRef(): void
     {
         $this->compile('function-return-ref.php');
diff --git a/src/CompilerBase.php b/src/CompilerBase.php
index 37922f79..2663aadf 100644
--- a/src/CompilerBase.php
+++ b/src/CompilerBase.php
@@ -2845,7 +2845,7 @@ class CompilerBase implements PropertyAccessContext
                 $nativeFunc = $this->escapeNamespace($nativeFunc);
             }
             $this->checkFunction($nativeFunc);
-            if ($this->hasFunction($nativeFunc)) {
+            if ($this->hasFunction($nativeFunc) && !$this->getFunction($nativeFunc)->method) {
                 return $nativeFunc;
             }
         }