From 90d4545a1f628be8980698c7da6c93ed679874b2 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 30 Oct 2021 21:32:02 +0200
Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/5218

---
 app/Support/Search/OperatorQuerySearch.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php
index 178a94cc92..7dbf35bf45 100644
--- a/app/Support/Search/OperatorQuerySearch.php
+++ b/app/Support/Search/OperatorQuerySearch.php
@@ -156,7 +156,7 @@ class OperatorQuerySearch implements SearchInterface
         $parser = new QueryParser();
         try {
             $query1 = $parser->parse($query);
-        } catch (TypeError|LogicException $e) {
+        } catch (TypeError | LogicException $e) {
             Log::error($e->getMessage());
             Log::error(sprintf('Could not parse search: "%s".', $query));
             throw new FireflyException('Invalid search value. See the logs.', 0, $e);
@@ -245,6 +245,7 @@ class OperatorQuerySearch implements SearchInterface
     private function handleSearchNode(Node $searchNode): void
     {
         $class = get_class($searchNode);
+        Log::debug(sprintf('Now in handleSearchNode(%s)', $class));
         switch ($class) {
             default:
                 Log::error(sprintf('Cannot handle node %s', $class));
@@ -252,7 +253,7 @@ class OperatorQuerySearch implements SearchInterface
             case Subquery::class:
                 // loop all notes in subquery:
                 foreach ($searchNode->getNodes() as $subNode) { // @phpstan-ignore-line
-                    $this->handleSearchNode($subNode); // lets hope its not too recursive!
+                    $this->handleSearchNode($subNode); // let's hope it's not too recursive!
                 }
                 break;
             case Word::class:
@@ -282,13 +283,15 @@ class OperatorQuerySearch implements SearchInterface
                             'value' => (string)$value,
                         ]
                     );
-                } else {
+                    Log::debug(sprintf('Added operator type "%s"', $operator));
+                }
+                if (!in_array($operator, $this->validOperators, true)) {
+                    Log::debug(sprintf('Added INVALID operator type "%s"', $operator));
                     $this->invalidOperators[] = [
                         'type'  => $operator,
                         'value' => (string)$value,
                     ];
                 }
-                break;
         }
 
     }
@@ -302,7 +305,7 @@ class OperatorQuerySearch implements SearchInterface
      */
     private function updateCollector(string $operator, string $value): bool
     {
-        Log::debug(sprintf('updateCollector("%s", "%s")', $operator, $value));
+        Log::debug(sprintf('Now in updateCollector("%s", "%s")', $operator, $value));
 
         // check if alias, replace if necessary:
         $operator = self::getRootOperator($operator);