From 1f913041b754bb69b39dc2a7f1e167d9537def0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Mon, 9 Aug 2021 18:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Database/Traits/QueryTrait.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Database/Traits/QueryTrait.php b/Database/Traits/QueryTrait.php index 587de2e4..605aec91 100644 --- a/Database/Traits/QueryTrait.php +++ b/Database/Traits/QueryTrait.php @@ -495,12 +495,16 @@ trait QueryTrait } /** - * @param array $conditionArray + * @param array|Closure|string $conditionArray * * @return QueryTrait + * @throws */ - public function whereOr(array $conditionArray = []): static + public function whereOr(array|Closure|string $conditionArray = []): static { + if ($conditionArray instanceof Closure) { + $conditionArray = $this->makeClosureFunction($conditionArray); + } $this->where = ['or', $conditionArray]; return $this; }