Merge pull request #15 from swisnl/JaZo-patch-1

Remove leading spaces to prevent empty terms
swisnl · Jan 28, 2019 · 122d4d6 · 122d4d6
2 parents 6d467c4 + 264b537
commit 122d4d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/TermBuilder.php b/src/TermBuilder.php
@@ -10,7 +10,7 @@ public static function terms($search)
 
         // Remove every boolean operator (+, -, > <, ( ), ~, *, ", @distance) from the search query
         // else we will break the MySQL query.
-        $search = rtrim(preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $search));
+        $search = trim(preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $search));
 
         $terms = collect(preg_split('/[\s,]+/', $search));
 

diff --git a/tests/TermBuilderTest.php b/tests/TermBuilderTest.php
@@ -17,6 +17,18 @@ public function test_termbuilder_builds_terms_array()
         $this->assertCount(0, $diff);
     }
 
+    public function test_termbuilder_does_not_build_empty_terms()
+    {
+        global $configReturn;
+        $configReturn = false;
+
+        $termsResult = ['<hi', 'im', 'a', 'few', 'terms>'];
+        $terms = TermBuilder::terms(implode(' ', $termsResult));
+        $termsResultWithoutSpecialChars = ['hi', 'im', 'a', 'few', 'terms'];
+        $diff = $terms->diff($termsResultWithoutSpecialChars);
+        $this->assertCount(0, $diff);
+    }
+
     public function test_termbuilder_builds_terms_array_with_wildcard()
     {
         global $configReturn;