Use matches from the query only. (#440)

* fix: Fixing query matches. (#439) * fix: Use only query params for matching.
BinarCode · Nov 25, 2021 · 96021a0 · 96021a0
1 parent 58acad2
commit 96021a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Filters/MatchesCollection.php b/src/Filters/MatchesCollection.php
@@ -50,8 +50,8 @@ public function inQuery(RestifyRequest $request): self
     {
         return $this->filter(function (MatchFilter $filter) use ($request) {
             $possibleKeys = collect([
-                $filter->getColumn(),
-                "-{$filter->getColumn()}",
+                $filter->column(),
+                "-{$filter->column()}",
             ]);
 
             if ($filters = collect($request->input('filter', []))) {
@@ -60,7 +60,7 @@ public function inQuery(RestifyRequest $request): self
                 }
             }
 
-            return $request->has("-{$filter->getColumn()}") || $request->has($filter->getColumn());
+            return (bool) ($request->query("-{$filter->column()}") || $request->query($filter->column()));
         });
     }
 

diff --git a/src/Http/Requests/ActionRequest.php b/src/Http/Requests/ActionRequest.php
@@ -45,7 +45,7 @@ public function builder(Action $action, int $size): Builder
             ->latest($this->model()->getKeyName());
     }
 
-    public function collectRepositories(Action $action, $count, Closure $callback)
+    public function collectRepositories(Action $action, $count, Closure $callback): array
     {
         $output = [];