From 0c029585895c94d94e1df11ec49e465f1359bbd6 Mon Sep 17 00:00:00 2001
From: tianfenghan <rango@swoole.com>
Date: Mon, 9 Feb 2026 11:53:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(php):=20=E6=B7=BB=E5=8A=A0=E5=A4=8D?=
 =?UTF-8?q?=E6=9D=82=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B9=B6=E4=BC=98=E5=8C=96=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现复杂命名空间组合规则，支持 use foo\bar; bar\fn() 形式的调用
- 新增 escapeZendFnName 方法用于函数名转义处理
- 使用统一的函数名转义机制替换模板中的硬编码逻辑
- 移除函数定义中的静态关键字以提高灵活性
---
 src/Php/CompilerBase.php      | 17 +++++++++++++++++
 src/Php/Translator.php        |  2 +-
 src/template/extension.cc.php | 10 +++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/Php/CompilerBase.php b/src/Php/CompilerBase.php
index 0fe4a614..88b271d9 100644
--- a/src/Php/CompilerBase.php
+++ b/src/Php/CompilerBase.php
@@ -1804,6 +1804,18 @@ class CompilerBase extends \PhpAot\Core\Translator
         if (isset($this->useFunctions[$fname])) {
             $possibleFunctionNames[] = $this->escapeNamespace($this->useFunctions[$fname]) . self::NAMESPACE_SEPARATOR . $fname;
         }
+        // 复杂命名空间规则，组合命名空间
+        // 例子：use foo\bar;  bar\fn();
+        foreach ($this->useNamespaces as $use) {
+            $ns1 = explode('\\', $use);
+            $ns2 = explode('\\', $fname);
+            if ($ns1[array_key_last($ns1)] === $ns2[array_key_first($ns2)]) {
+                $ns = array_merge($ns1, $ns2);
+                array_splice($ns, array_key_last($ns1) + 1);
+                $possibleFunctionNames[] = $this->escapeNamespace(implode('\\', $ns));
+                break;
+            }
+        }
         foreach ($possibleFunctionNames as $name) {
             // 在预处理阶段检测到函数声明，但是未定义，说明在当前文件，但是顺序错误
             // 跳过，稍后再处理
@@ -2373,6 +2385,11 @@ class CompilerBase extends \PhpAot\Core\Translator
         return str_replace('\\', self::NAMESPACE_SEPARATOR, strtolower($ns));
     }
 
+    protected function escapeZendFnName(string $fn): string
+    {
+        return str_replace('\\', '_', strtolower($fn));
+    }
+
     protected function escapeName(string $name): string
     {
         return strtolower($name);
diff --git a/src/Php/Translator.php b/src/Php/Translator.php
index d4e7ccda..73925cc9 100644
--- a/src/Php/Translator.php
+++ b/src/Php/Translator.php
@@ -972,7 +972,7 @@ class Translator extends Preprocessor
 
     private function genFunctionWrapper(FunctionDef $functionDef): string
     {
-        $name = $functionDef->namespace ? $functionDef->namespace . '_' . $functionDef->name : $functionDef->name;
+        $name = $this->escapeZendFnName($functionDef->getNamespacedName());
         $cppCode = 'ZEND_FUNCTION(' . $name . '){' . PHP_EOL;
         $fn = self::PREFIX . $this->getNativeName($functionDef->name, $functionDef->namespace);
         $cppCode .= $this->genWrapperFunctionArgs($fn, $functionDef);
diff --git a/src/template/extension.cc.php b/src/template/extension.cc.php
index 0db307d7..136f15c9 100644
--- a/src/template/extension.cc.php
+++ b/src/template/extension.cc.php
@@ -75,19 +75,19 @@ foreach ($this->functions as $functionDef):
     if ($this->buildMode === 'ext' and $functionDef->name === 'main') {
         continue;
     }
+    $zif_name = $this->escapeZendFnName($functionDef->getNamespacedName());
 ?>
 <?php if ($functionDef->namespace): ?>
-<?php $zif_name = $functionDef->namespace . '_' . $functionDef->name; ?>
     ZEND_NAMED_FE("<?=$this->escapeString($functionDef->getNamespacedName())?>", ZEND_FN(<?= $zif_name ?>), arginfo_<?=$zif_name?>)
 <?php else: ?>
-    ZEND_FE(<?=$functionDef->name?>, arginfo_<?=$functionDef->name?>)
+    ZEND_FE(<?=$zif_name?>, arginfo_<?=$zif_name?>)
 <?php endif; ?>
 <?php endforeach;?>
     ZEND_FE_END
 };
 // clang-format on
 
-static PHP_MINIT_FUNCTION(<?=$this->targetName?>) {
+PHP_MINIT_FUNCTION(<?=$this->targetName?>) {
 // class/interface class entries
 <?php
 foreach ($this->classCeList as $ce):
@@ -151,7 +151,7 @@ foreach ($this->nativeConstants as $name => $constant):
 <?php endforeach; ?>
 }
 
-static PHP_RINIT_FUNCTION(<?=$this->targetName?>) {
+PHP_RINIT_FUNCTION(<?=$this->targetName?>) {
     php::request_init();
     php_app_init();
 
@@ -166,7 +166,7 @@ static PHP_RINIT_FUNCTION(<?=$this->targetName?>) {
     return SUCCESS;
 }
 
-static PHP_RSHUTDOWN_FUNCTION(<?=$this->targetName?>) {
+PHP_RSHUTDOWN_FUNCTION(<?=$this->targetName?>) {
     php_app_clean();
     php::request_shutdown();
     return SUCCESS;