Don't add wild cards to an empty terms

Author: dmitriim

classes/query.php

@@ -136,8 +136,14 @@ private function add_wildcards($q) {
         // Add wildcards to start and end of words.
         foreach ($terms as $term) {
 
+            if (empty($term)) {
+                continue;
+            }
+
+            $term = str_replace(' ', '', $term);
+
             // Ignore words: and, or.
-            if ($term == 'and' || $term == 'or') {
+            if (strtolower($term) == 'and' || strtolower($term) == 'or') {
                 $wildcardterms[] = $term;
                 continue;
             }

tests/query_test.php

@@ -387,11 +387,15 @@ public function test_construct_wildcard() {
         $proxy = $method->invoke(new \search_elastic\query, $q); // Get result of invoked method.
         $this->assertEquals('*test*', $proxy);
 
-        $q = 'test*';
+        $q = 'test ';
+        $proxy = $method->invoke(new \search_elastic\query, $q); // Get result of invoked method.
+        $this->assertEquals('*test*', $proxy);
+
+        $q = 'test* ';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*test*', $proxy);
 
-        $q = '*test';
+        $q = ' *test';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*test*', $proxy);
 
@@ -403,13 +407,25 @@ public function test_construct_wildcard() {
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*lazy* *brown* *dog*', $proxy);
 
+        $q = 'lazy  brown    dog';
+        $proxy = $method->invoke(new \search_elastic\query, $q);
+        $this->assertEquals('*lazy* *brown* *dog*', $proxy);
+
         $q = 'this and that';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*this* and *that*', $proxy);
 
+        $q = 'this AND that';
+        $proxy = $method->invoke(new \search_elastic\query, $q);
+        $this->assertEquals('*this* AND *that*', $proxy);
+
         $q = 'this or that';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*this* or *that*', $proxy);
+
+        $q = 'this Or that';
+        $proxy = $method->invoke(new \search_elastic\query, $q);
+        $this->assertEquals('*this* Or *that*', $proxy);
     }
 
 }