fix(QueryBuilder): PHP 8.1 table 设置为字符串，以避免 Passing null to paramet…

…er of type string is deprecated 错误
twinh · Nov 30, 2023 · 0eb223f · 0eb223f
1 parent db903ba
commit 0eb223f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/Db/QueryBuilderPropsTrait.php b/lib/Db/QueryBuilderPropsTrait.php
@@ -15,9 +15,9 @@ trait QueryBuilderPropsTrait
     /**
      * The name of the table
      *
-     * @var string|null
+     * @var string
      */
-    protected $table;
+    protected $table = '';
 
     /**
      * The column names of the table
@@ -55,7 +55,7 @@ trait QueryBuilderPropsTrait
     protected $queryParts = [
         'select' => [],
         'distinct' => null,
-        'from' => null,
+        'from' => '',
         'join' => [],
         'set' => [],
         'where' => [],

diff --git a/lib/Db/QueryBuilderTrait.php b/lib/Db/QueryBuilderTrait.php
@@ -520,7 +520,7 @@ public function getDbKeyConverter(): callable
      */
     protected function getTable(): ?string
     {
-        return $this->table ?? null;
+        return $this->table;
     }
 
     /**

diff --git a/lib/ModelTrait.php b/lib/ModelTrait.php
@@ -590,7 +590,7 @@ protected function toRet($merge = []): Ret
      */
     protected function getTable(): string
     {
-        if (!isset($this->table)) {
+        if (!$this->table) {
             $str = $this->wei->str;
             $this->table = $str->pluralize($str->snake($this->getModelBaseName()));
         }