Manage double wildcards in the terms

Author: dmitriim

classes/query.php

@@ -149,14 +149,10 @@ private function add_wildcards($q) {
             }
 
             // Add wild card to start of word.
-            if (substr($term, 0, 1) != '*') {
-                $term = '*' . $term;
-            }
+            $term = '*' . trim($term, '*');
 
             // Add wild card to end of word.
-            if (substr($term, -1, 1) != '*') {
-                $term = $term . '*';
-            }
+            $term = rtrim($term, '*') . '*';
 
             $wildcardterms[] = $term;
         }

tests/query_test.php

@@ -395,10 +395,18 @@ public function test_construct_wildcard() {
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*test*', $proxy);
 
+        $q = 'test**';
+        $proxy = $method->invoke(new \search_elastic\query, $q);
+        $this->assertEquals('*test*', $proxy);
+
         $q = ' *test';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*test*', $proxy);
 
+        $q = '***test';
+        $proxy = $method->invoke(new \search_elastic\query, $q);
+        $this->assertEquals('*test*', $proxy);
+
         $q = '*test*';
         $proxy = $method->invoke(new \search_elastic\query, $q);
         $this->assertEquals('*test*', $proxy);