Merge pull request #226 from ViliusS/enhance-boolean-search

Enhance boolean search expression.
teamtnt · Nov 12, 2020 · 5684986 · 5684986
2 parents 558d49d + 6b983c7
commit 5684986
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Support/Expression.php b/src/Support/Expression.php
@@ -86,8 +86,8 @@ public function priority($operator)
 
     public function lex($string)
     {
-        $bad  = [' or ', '-', ' ', '@', '.'];
-        $good = [ '|'  , '~', '&', '&', '&'];
+        $bad  = [' or ', ' -', ' '];
+        $good = ['|', '~', '&'];
 
         $string = str_replace($bad, $good, $string);
         $string = mb_strtolower($string);

diff --git a/tests/support/ExpressionTest.php b/tests/support/ExpressionTest.php
@@ -15,7 +15,6 @@ public function testToPostfix()
         $this->assertEquals(['great', 'awsome', '|'], $exp->toPostfix("great or awsome"));
         $this->assertEquals(['great', 'awsome', '&'], $exp->toPostfix("great awsome"));
         $this->assertEquals(['email', 'test', '&', 'com', '&'], $exp->toPostfix("email test com"));
-        $this->assertEquals(['email', 'test', '&', 'com', '&'], $exp->toPostfix("[email protected]"));
         $this->assertEquals(['first', 'last', '&', 'something', 'else', '&', '|'], $exp->toPostfix("(first last) or (something else)"));
     }
 }