From a6c0e2aa0e3a8fa9febead0aa6ec1a47991db098 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 18 Mar 2025 10:42:35 +0200 Subject: [PATCH] ref --- application/Espo/Core/Select/SearchParams.php | 11 ++++++++++- application/Espo/Core/Select/SelectBuilder.php | 9 ++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/application/Espo/Core/Select/SearchParams.php b/application/Espo/Core/Select/SearchParams.php index 42f7396d1d..b83982ab22 100644 --- a/application/Espo/Core/Select/SearchParams.php +++ b/application/Espo/Core/Select/SearchParams.php @@ -43,7 +43,16 @@ use stdClass; class SearchParams { /** @var array */ - private array $rawParams = []; + private array $rawParams = [ + 'select' => null, + 'boolFilterList' => [], + 'orderBy' => null, + 'order' => null, + 'maxSize' => null, + 'where' => null, + 'primaryFilter' => null, + 'textFilter' => null, + ]; public const ORDER_ASC = 'ASC'; public const ORDER_DESC = 'DESC'; diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php index 1a5f05df13..9190259da8 100644 --- a/application/Espo/Core/Select/SelectBuilder.php +++ b/application/Espo/Core/Select/SelectBuilder.php @@ -499,11 +499,10 @@ class SelectBuilder return; } - $searchParams = SearchParams::fromRaw([ - 'boolFilterList' => $this->boolFilterList, - 'primaryFilter' => $this->primaryFilter, - 'textFilter' => $this->textFilter, - ]); + $searchParams = SearchParams::create() + ->withBoolFilterList($this->boolFilterList) + ->withPrimaryFilter($this->primaryFilter) + ->withTextFilter($this->textFilter); if ($this->searchParams) { $searchParams = SearchParams::merge($searchParams, $this->searchParams);