Update query string methods and tests for flexibility

Changed default $fields parameter in query string methods from '*' to null for greater flexibility. Added a new test to verify combining query string searches with standard query operators. Also fixed duplicate 'fuzzy_transpositions' entry and added 'fuzzyRewrite' method annotation in QueryStringOptions.

Author: pdphilip

src/Eloquent/Docs/ModelDocs.php

@@ -128,10 +128,10 @@
  * @method static $this searchNotFuzzyPrefix($term, $fields = ['*'], $options = [])
  * @method static $this orSearchNotFuzzyPrefix($term, $fields = ['*'], $options = [])
  *                                                                                    -----------------------------------
- * @method static $this searchQueryString($query, $fields = '*', $options = [])
- * @method static $this orSearchQueryString($query, $fields = '*', $options = [])
- * @method static $this searchNotQueryString($query, $fields = '*', $options = [])
- * @method static $this orSearchNotQueryString($query, $fields = '*', $options = [])
+ * @method static $this searchQueryString($query, $fields = null, $options = [])
+ * @method static $this orSearchQueryString($query, $fields = null, $options = [])
+ * @method static $this searchNotQueryString($query, $fields = null, $options = [])
+ * @method static $this orSearchNotQueryString($query, $fields = null, $options = [])
  *===========================================
  * Speciality methods
  *===========================================

src/Query/Options/QueryStringOptions.php

@@ -17,6 +17,7 @@
  * @method $this fuzzyMaxExpansions(int $value)
  * @method $this fuzzyPrefixLength(int $value)
  * @method $this fuzzyTranspositions(bool $value)
+ * @method $this fuzzyRewrite(int $value)
  * @method $this lenient(bool $value)
  * @method $this maxDeterminizedStates(int $value)
  * @method $this minimumShouldMatch(string $value)
@@ -43,7 +44,6 @@ public function allowedOptions(): array
             'fuzzy_prefix_length',
             'fuzzy_transpositions',
             'fuzzy_rewrite',
-            'fuzzy_transpositions',
             'lenient',
             'max_determinized_states',
             'minimum_should_match',

tests/QueryStringTest.php

@@ -58,6 +58,18 @@
 
 });
 
+it('tests basic query string combined with normal query operators', function () {
+    $users = User::searchQueryString('age:35')->where('title', 'admin')->get();
+    expect($users)->toHaveCount(2);
+
+    $users = User::searchQueryString('age:>30')->count();
+    expect($users)->toBe(6);
+
+    $users = User::searchQueryString('age:(NOT 35)')->skip(4)->limit(3)->get();
+    expect($users)->toHaveCount(2);
+
+});
+
 it('tests AND query string', function () {
 
     $users = User::searchQueryString('age:35')->searchQueryString('title:admin')->get();