wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
laravie · Dec 10, 2021 · 94cbf67 · 94cbf67
1 parent ea85f92
commit 94cbf67
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Cannot use array destructuring on Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), mixed\\>&iterable\\<Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), mixed\\>\\>\\.$#"
-			count: 1
-			path: src/Searchable.php
-

diff --git a/src/Searchable.php b/src/Searchable.php
@@ -22,14 +22,14 @@ class Searchable
     /**
      * Search columns.
      *
-     * @var array
+     * @var array<int, string|\Laravie\QueryFilter\Contracts\Filter\Filter>
      */
     protected $fields = [];
 
     /**
      * Construct a new Search Query.
-     * 
-     * @param  array<int, string|\Laravie\QueryFilter\Contracts\Filter>  $fields
+     *
+     * @param  array<int, string|\Laravie\QueryFilter\Contracts\Filter\Filter>  $fields
      */
     public function __construct(?string $keyword, array $fields = [])
     {
@@ -68,7 +68,7 @@ public function apply($query)
         $likeOperator = like_operator(connection_type($query));
 
         /**
-         * @var \Illuminate\Support\Collection<int, \Laravie\QueryFilter\Contracts\Filter> $filters
+         * @var \Illuminate\Support\Collection<int, \Laravie\QueryFilter\Contracts\Filter\Filter> $filters
          * @var \Illuminate\Support\Collection<int, string> $fields
          */
         [$filters, $fields] = Collection::make($this->fields)->partition(static function ($field) {

diff --git a/src/Taxonomy.php b/src/Taxonomy.php
@@ -13,7 +13,7 @@ class Taxonomy
     /**
      * Taxonomy columns.
      *
-     * @var array<int, string|\Laravie\QueryFilter\Contracts\Filter>
+     * @var array<int, string|\Laravie\QueryFilter\Contracts\Filter\Filter>
      */
     protected $fields = [];
 
@@ -33,9 +33,9 @@ class Taxonomy
 
     /**
      * Construct a new Matches Query.
-     * 
+     *
      * @param  array<string, \Closure|callable>  $rules
-     * @param  array<int, string|\Laravie\QueryFilter\Contracts\Filter>  $fields
+     * @param  array<int, string|\Laravie\QueryFilter\Contracts\Filter\Filter>  $fields
      */
     public function __construct(?string $terms, array $rules = [], array $fields = [])
     {
@@ -67,17 +67,16 @@ public function apply($query)
      */
     protected function matchBasicConditions($query): void
     {
-        (new Searchable(
-            $this->terms->basic(), $this->fields
-        ))
-        ->wildcardCharacter($this->wildcardCharacter)
-        ->tap(function (Searchable $searchable) {
-            if (($this->wildcardSearching ?? true) === true) {
-                $searchable->allowWildcardSearching();
-            } else {
-                $searchable->noWildcardSearching();
-            }
-        })->apply($query);
+        $searchable = (new Searchable($this->terms->basic(), $this->fields))
+                            ->wildcardCharacter($this->wildcardCharacter);
+
+        if (($this->wildcardSearching ?? true) === true) {
+            $searchable->allowWildcardSearching();
+        } else {
+            $searchable->noWildcardSearching();
+        }
+
+        $searchable->apply($query);
     }
 
     /**

diff --git a/src/Terms.php b/src/Terms.php
@@ -24,7 +24,7 @@ class Terms implements Countable
 
     /**
      * Construct a new Condition value object.
-     * 
+     *
      * @param  array<int, string>  $tagged
      */
     public function __construct(string $basic, array $tagged)
@@ -37,7 +37,7 @@ public function __construct(string $basic, array $tagged)
      * Parse rules from keyword.
      *
      * @param  array<int, string>  $rules
-     * 
+     *
      * @return static
      */
     public static function parse(string $term, array $rules)
@@ -78,8 +78,8 @@ public function basic(): string
 
     /**
      * Get tagged conditions.
-     * 
-     * @return array<int, string> 
+     *
+     * @return array<int, string>
      */
     public function tagged(): array
     {
@@ -121,7 +121,7 @@ public function where(string $term)
         }
 
         if ($type === '*') {
-            [, $value] = explode(':', $results[0] ?? null, 2);
+            [, $value] = explode(':', $results[0] ?? '', 2);
 
             return trim($value, '"');
         }