diff --git a/app/Abstracts/Listeners/Report.php b/app/Abstracts/Listeners/Report.php index e5a02b2cb..44ac1e195 100644 --- a/app/Abstracts/Listeners/Report.php +++ b/app/Abstracts/Listeners/Report.php @@ -150,7 +150,7 @@ abstract class Report public function applySearchStringFilter($event) { - $input = request('search'); + $input = request('search', ''); // Remove year as it's handled based on financial start $search_year = 'year:' . $this->getSearchStringValue('year', '', $input); diff --git a/app/Traits/SearchString.php b/app/Traits/SearchString.php index 1acded948..01b01488d 100644 --- a/app/Traits/SearchString.php +++ b/app/Traits/SearchString.php @@ -8,16 +8,12 @@ trait SearchString * Get the value of a name in search string * Example: search=type:customer year:2020 account_id:20 * Example: issued_at>=2021-02-01 issued_at<=2021-02-10 account_id:49 - * - * @return string|array */ - public function getSearchStringValue($name, $default = '', $input = null) + public function getSearchStringValue(string $name, string $default = '', string $input = ''): string|array { $value = $default; - if (is_null($input)) { - $input = request('search'); - } + $input = $input ?: request('search', ''); // $manager = $this->getSearchStringManager(); // $parsed = $manager->parse($input); @@ -30,14 +26,14 @@ trait SearchString if (empty($variable[0]) || ($variable[0] != $name) || empty($variable[1])) { continue; } - + if (strpos($column, ':')) { $value = $variable[1]; break; } - if (!is_array($value)) { + if (! is_array($value)) { $value = []; }