From a01548ae968f2d4ad26b8e2de262048975429751 Mon Sep 17 00:00:00 2001
From: tianfenghan <rango@swoole.com>
Date: Mon, 29 Jun 2026 14:01:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(php):=20=E4=BF=AE=E5=A4=8D=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E6=A3=80=E6=9F=A5=E4=B8=AD=E7=9A=84=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E6=80=A7=E5=AE=BD=E5=8C=96=E5=92=8C=E5=8F=82=E6=95=B0=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现了PHP允许的方法可见性宽化（如protected到public），但禁止窄化
- 添加了子类可以添加可选尾随参数的支持
- 修复了必需参数数量比较逻辑，确保子类不能要求比父类更多的必需参数
- 添加了对缺少父类声明参数的检查
- 实现了额外子类参数必须为可选或可变参数的验证
- 添加了可见性等级比较函数来正确处理继承可见性检查
---
 phpunit/src/InheritanceErrorTest.php | 24 +++++++++++++++-
 src/Php/Translator.php               | 43 ++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/phpunit/src/InheritanceErrorTest.php b/phpunit/src/InheritanceErrorTest.php
index 1139ab14..6453e860 100644
--- a/phpunit/src/InheritanceErrorTest.php
+++ b/phpunit/src/InheritanceErrorTest.php
@@ -21,6 +21,18 @@ class InheritanceErrorTest extends TestCase
         $this->fail('Expected TestError exception was not thrown');
     }
 
+    private function assertCompiles(string $file): void
+    {
+        global $translator;
+        $compiler = CompilerTest::create(ROOT_PATH);
+        $translator = $compiler;
+        $testFile = __DIR__ . '/../code/' . $file;
+        $compiler->addFiles([$testFile]);
+        $compiler->prepareFile($testFile);
+        $compiler->convertFile($testFile);
+        $this->addToAssertionCount(1);
+    }
+
     public function testParameterCountMismatch()
     {
         $this->exec('must be compatible', 'inheritance_error.php');
@@ -48,7 +60,17 @@ class InheritanceErrorTest extends TestCase
 
     public function testMethodVisibilityMismatch()
     {
-        $this->exec('must be compatible', 'inheritance_error_visibility.php');
+        $this->exec('must be compatible', 'inheritance_error_visibility_narrow.php');
+    }
+
+    public function testMethodVisibilityWideningIsAllowed()
+    {
+        $this->assertCompiles('inheritance_error_visibility.php');
+    }
+
+    public function testChildMayAddOptionalTrailingParameter()
+    {
+        $this->assertCompiles('inheritance_optional_param_allowed.php');
     }
 
     public function testPropertyTypeMismatch()
diff --git a/src/Php/Translator.php b/src/Php/Translator.php
index 3577e509..12e701f6 100644
--- a/src/Php/Translator.php
+++ b/src/Php/Translator.php
@@ -2966,8 +2966,9 @@ CODE;
                 "with `{$parentClass}::{$methodName}()`");
         };
 
-        // Compare visibility (public/protected/private)
-        if (($this->methodDef->flags & Modifiers::VISIBILITY_MASK) !== ($parentMethodDef->flags & Modifiers::VISIBILITY_MASK)) {
+        // PHP allows widening visibility in overrides (e.g. protected -> public),
+        // but forbids narrowing it.
+        if ($this->getVisibilityRank($this->methodDef->flags) < $this->getVisibilityRank($parentMethodDef->flags)) {
             $error('visibility mismatch');
         }
 
@@ -2976,19 +2977,23 @@ CODE;
             return;
         }
 
-        // Compare parameter count
-        if (count($childFuncDef->argInfoList) !== count($parentFuncDef->argInfoList)) {
-            $error('parameter count mismatch');
-        }
-
         // Compare return type
         if ($childFuncDef->returnType !== $parentFuncDef->returnType ||
             $childFuncDef->returnClass !== $parentFuncDef->returnClass) {
             $error('return type mismatch');
         }
 
-        // Compare each parameter
+        // Child methods may add optional trailing parameters, but they cannot
+        // require more arguments than the parent contract.
+        if ($childFuncDef->argCountRequired > $parentFuncDef->argCountRequired) {
+            $error('required parameter count mismatch');
+        }
+
+        // Compare each parent-declared parameter position.
         foreach ($parentFuncDef->argInfoList as $i => $parentArg) {
+            if (!isset($childFuncDef->argInfoList[$i])) {
+                $error("missing parameter #{$i}");
+            }
             $childArg = $childFuncDef->argInfoList[$i];
             if ($childArg->type !== $parentArg->type || $childArg->class !== $parentArg->class) {
                 $error("parameter #{$i} type mismatch");
@@ -3000,6 +3005,28 @@ CODE;
                 $error("parameter #{$i} variadic mismatch");
             }
         }
+
+        // Any extra child parameters must be optional or variadic.
+        for ($i = count($parentFuncDef->argInfoList); $i < count($childFuncDef->argInfoList); $i++) {
+            $childArg = $childFuncDef->argInfoList[$i];
+            if (!$childArg->variadic && $childArg->defaultValue === null) {
+                $error("extra required parameter #{$i}");
+            }
+        }
+    }
+
+    private function getVisibilityRank(int $flags): int
+    {
+        if ($flags & Modifiers::PUBLIC) {
+            return 3;
+        }
+        if ($flags & Modifiers::PROTECTED) {
+            return 2;
+        }
+        if ($flags & Modifiers::PRIVATE) {
+            return 1;
+        }
+        return 3;
     }
 
     private function checkPropertyOverride(Node\Stmt\Class_|Node\Stmt\Trait_|Node\Stmt\Enum_ $classStmt): void