Merge pull request #17 from JaguarJack/main

walkor · web-flow · commit af4a2586177a · 2025-05-27T21:15:25.000+08:00
fix: 修复 DbManager::instance 类型错误
diff --git 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');

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class DbManager extends \think\DbManager`
`34`	`34`	`* @return ConnectionInterface`
`35`	`35`	`* @throws Throwable`
`36`	`36`	`*/`
`37`		`- protected function instance(?string $name = null, bool $force = false): ConnectionInterface`
	`37`	`+ protected function instance(array\|string\|null $name = null, bool $force = false): ConnectionInterface`
`38`	`38`	`{`
`39`	`39`	`if (empty($name)) {`
`40`	`40`	`$name = $this->getConfig('default', 'mysql');`