From abc856973e65f593201e39b5e01a511f38ce077c Mon Sep 17 00:00:00 2001
From: JaguarJack <wuyanwen1992@gmail.com>
Date: Tue, 27 May 2025 19:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20DbManager::instance?=
 =?UTF-8?q?=20=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新拉取的 webman 使用 think-orm 插件的时候，会报如下错误

Fatal error: Declaration of Webman\ThinkOrm\DbManager::instance(?string $name = null, bool $force = false): think\db\ConnectionInterface must be compatible with think\DbManager::instance(array|string|null $name = null, bool $force = false): think\db\ConnectionInterface in C:\project\catch-webman\vendor\webman\think-orm\src\DbManager.php on line 37
---
 src/DbManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DbManager.php b/src/DbManager.php
index 6a8d13d..11af753 100644
--- a/src/DbManager.php
+++ b/src/DbManager.php
@@ -34,7 +34,7 @@ class DbManager extends \think\DbManager
      * @return ConnectionInterface
      * @throws Throwable
      */
-    protected function instance(?string $name = null, bool $force = false): ConnectionInterface
+    protected function instance(array|string|null $name = null, bool $force = false): ConnectionInterface
     {
         if (empty($name)) {
             $name = $this->getConfig('default', 'mysql');