diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 73901525ef..8cf1c8c3b3 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -313,7 +313,7 @@ class GroupCollector implements GroupCollectorInterface $this->query->where( static function (EloquentBuilder $q) use ($array) { $q->where( - function (EloquentBuilder $q1) use ($array) { + static function (EloquentBuilder $q1) use ($array) { foreach ($array as $word) { $keyword = sprintf('%%%s%%', $word); $q1->where('transaction_journals.description', 'LIKE', $keyword); diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 5e28ef2d6a..fa09873cd9 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -102,7 +102,7 @@ class Search implements SearchInterface { $string = implode(' ', $this->words); if ('' === $string) { - return \is_string($this->originalQuery) ? $this->originalQuery : ''; + return is_string($this->originalQuery) ? $this->originalQuery : ''; } return $string; @@ -132,6 +132,11 @@ class Search implements SearchInterface $filteredQuery = str_replace($match, '', $filteredQuery); } $filteredQuery = trim(str_replace(['"', "'"], '', $filteredQuery)); + + // str replace some stuff: + $search = ['%', '=', '/', '<', '>', '(', ')', ';']; + $filteredQuery = str_replace($search, ' ', $filteredQuery); + if ('' !== $filteredQuery) { $this->words = array_map('trim', explode(' ', $filteredQuery)); }