diff --git a/src/Filters/AdvancedFiltersCollection.php b/src/Filters/AdvancedFiltersCollection.php index cd0f06a8..969bf96d 100644 --- a/src/Filters/AdvancedFiltersCollection.php +++ b/src/Filters/AdvancedFiltersCollection.php @@ -2,7 +2,6 @@ namespace Binaryk\LaravelRestify\Filters; -use Binaryk\LaravelRestify\Http\Requests\RepositoryApplyFiltersRequest; use Binaryk\LaravelRestify\Http\Requests\RestifyRequest; use Binaryk\LaravelRestify\Repositories\Repository; use Illuminate\Support\Collection; @@ -17,12 +16,12 @@ class AdvancedFiltersCollection extends Collection { public function authorized(RestifyRequest $request): self { - return $this->filter(fn(Filter $filter) => $filter->authorizedToSee($request))->values(); + return $this->filter(fn (Filter $filter) => $filter->authorizedToSee($request))->values(); } public function apply(RestifyRequest $request, $query): self { - return $this->each(fn(AdvancedFilter $filter) => $filter->filter($request, $query, $filter->dataObject->value)); + return $this->each(fn (AdvancedFilter $filter) => $filter->filter($request, $query, $filter->dataObject->value)); } public static function collectQueryFilters(RestifyRequest $request, Repository $repository): self @@ -36,7 +35,7 @@ public static function collectQueryFilters(RestifyRequest $request, Repository $ return static::make($filters) ->map(function (array $queryFilter) use ($allowedFilters, $request) { /** * @var AdvancedFilter $advancedFilter */ - $advancedFilter = $allowedFilters->first(fn( + $advancedFilter = $allowedFilters->first(fn ( AdvancedFilter $filter ) => $filter::uriKey() === data_get($queryFilter, 'key')); diff --git a/tests/Feature/Filters/AdvancedFilterTest.php b/tests/Feature/Filters/AdvancedFilterTest.php index f6d57160..96d0dcdc 100644 --- a/tests/Feature/Filters/AdvancedFilterTest.php +++ b/tests/Feature/Filters/AdvancedFilterTest.php @@ -38,7 +38,7 @@ public function test_filters_can_have_definition(): void $this->getJson(PostRepository::route('filters', query: [ 'only' => 'matches,searchables,sortables', ]))->assertJson( - fn(AssertableJson $json) => $json + fn (AssertableJson $json) => $json ->where('data.1.repository.key', 'users') ->where('data.1.repository.label', 'Users') ->where('data.1.repository.display_key', 'id') @@ -73,7 +73,7 @@ public function test_value_filter_doesnt_require_value(): void 'filters' => $filters, ])) ->assertJson( - fn(AssertableJson $json) => $json + fn (AssertableJson $json) => $json ->where('data.0.attributes.title', $expectedTitle) ->etc() ) @@ -197,7 +197,7 @@ public function test_the_timestamp_filter_is_applied(): void ])) ->assertOk() ->assertJson( - fn(AssertableJson $json) => $json + fn (AssertableJson $json) => $json ->where('data.0.attributes.title', 'Valid post') ->count('data', 1) ->etc()