Merge pull request #90 from abbasudo/analysis-e0WMr9

Apply fixes from StyleCI

src/Filters/Resolve.php

@@ -37,7 +37,7 @@ class Resolve
     public function __construct(FilterList $filterList, Model $model)
     {
         $this->filterList = $filterList;
-        $this->model      = $model;
+        $this->model = $model;
     }
 
     /**
@@ -46,10 +46,9 @@ public function __construct(FilterList $filterList, Model $model)
      * @param array|string $values
      *
      * @throws Exception
-     *
-     * @return void
      * @throws Exception
      *
+     * @return void
      */
     public function apply(Builder $query, string $field, array|string $values): void
     {
@@ -66,10 +65,9 @@ public function apply(Builder $query, string $field, array|string $values): void
      * @param Closure $closure
      *
      * @throws Exception
-     *
-     * @return bool
      * @throws Exception
      *
+     * @return bool
      */
     private function safe(Closure $closure): bool
     {
@@ -110,10 +108,9 @@ private function validate(array|string $values = [])
      * @param array|string|null $filters
      *
      * @throws Exception
-     *
-     * @return void
      * @throws Exception
      *
+     * @return void
      */
     private function filter(Builder $query, string $field, array|string|null $filters): void
     {
@@ -123,17 +120,17 @@ private function filter(Builder $query, string $field, array|string|null $filter
         // Resolve the filter using the appropriate strategy
         if ($this->filterList->get($field) !== null) {
             //call apply method of the appropriate filter class
-            $this->safe(fn() => $this->applyFilterStrategy($query, $field, $filters));
+            $this->safe(fn () => $this->applyFilterStrategy($query, $field, $filters));
         } else {
             // If the field is not recognized as a filter strategy, it is treated as a relation
-            $this->safe(fn() => $this->applyRelationFilter($query, $field, $filters));
+            $this->safe(fn () => $this->applyRelationFilter($query, $field, $filters));
         }
     }
 
     /**
      * @param Builder $query
-     * @param string $operator
-     * @param array $filters
+     * @param string  $operator
+     * @param array   $filters
      *
      * @return void
      */
@@ -190,7 +187,7 @@ private function relation(Builder $query, Closure $callback)
     {
         // remove the last field until its empty
         $field = array_shift($this->fields);
-        $query->whereHas($field, fn($subQuery) => $this->applyRelations($subQuery, $callback));
+        $query->whereHas($field, fn ($subQuery) => $this->applyRelations($subQuery, $callback));
     }
 
     /**

src/Traits/Filterable.php

@@ -83,6 +83,7 @@ private function bootFilter(): void
 
         app()->bind(Resolve::class, function () {
             $resolver = $this->getFilterResolver();
+
             return new $resolver(app(FilterList::class), $this);
         });
     }

tests/App/Models/Post.php

@@ -19,7 +19,7 @@ class Post extends Model
 
     protected $fillable = [
         'title',
-        'user_id'
+        'user_id',
     ];
 
     public function comments(): HasMany

tests/Feature/RelationFilterTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use Abbasudo\Purity\Tests\App\Models\Book;
 use Abbasudo\Purity\Tests\App\Models\Post;
 use Abbasudo\Purity\Tests\App\Models\Product;
 use Abbasudo\Purity\Tests\App\Models\User;
@@ -87,12 +86,12 @@ public function it_can_filter_by_has_one_relation(): void
 
         $product->book()->create([
             'name'        => 'book',
-            'description' => 'book for product'
+            'description' => 'book for product',
         ]);
 
         $response = $this->getJson('/products?filters[book][name][$eq]=book');
 
         $response->assertOk();
         $response->assertJsonCount(1);
     }
-}
+}