From 55cad78bbe1ac1f7010f937713fb26d55234fbfa Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Tue, 8 Dec 2020 11:03:09 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Http/Controllers/RepositoryFilterController.php | 10 ++++------ tests/Controllers/RepositoryFilterControllerTest.php | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Http/Controllers/RepositoryFilterController.php b/src/Http/Controllers/RepositoryFilterController.php index 1b8efc54f..2bf76e61a 100644 --- a/src/Http/Controllers/RepositoryFilterController.php +++ b/src/Http/Controllers/RepositoryFilterController.php @@ -2,13 +2,11 @@ namespace Binaryk\LaravelRestify\Http\Controllers; -use Binaryk\LaravelRestify\Filter; use Binaryk\LaravelRestify\Filters\MatchFilter; use Binaryk\LaravelRestify\Filters\SearchableFilter; use Binaryk\LaravelRestify\Filters\SortableFilter; use Binaryk\LaravelRestify\Http\Requests\RepositoryFiltersRequest; use Illuminate\Support\Collection; -use Illuminate\Support\Str; class RepositoryFilterController extends RepositoryController { @@ -21,19 +19,19 @@ public function __invoke(RepositoryFiltersRequest $request) // After ->when($request->has('include'), function (Collection $collection) use ($repository, $request) { return $collection->merge( - collect(str_getcsv($request->input('include')))->map(fn($key) => collect([ + collect(str_getcsv($request->input('include')))->map(fn ($key) => collect([ SearchableFilter::uriKey() => SearchableFilter::class, MatchFilter::uriKey() => MatchFilter::class, SortableFilter::uriKey() => SortableFilter::class, - ])->get($key))->flatMap(fn($filterable) => $filterable::makeForRepository($repository)) + ])->get($key))->flatMap(fn ($filterable) => $filterable::makeForRepository($repository)) ); }) ->when($request->has('only'), function (Collection $collection) use ($repository, $request) { - return collect(str_getcsv($request->input('only')))->map(fn($key) => collect([ + return collect(str_getcsv($request->input('only')))->map(fn ($key) => collect([ SearchableFilter::uriKey() => SearchableFilter::class, MatchFilter::uriKey() => MatchFilter::class, SortableFilter::uriKey() => SortableFilter::class, - ])->get($key))->flatMap(fn($filterable) => $filterable::makeForRepository($repository)); + ])->get($key))->flatMap(fn ($filterable) => $filterable::makeForRepository($repository)); }) ); } diff --git a/tests/Controllers/RepositoryFilterControllerTest.php b/tests/Controllers/RepositoryFilterControllerTest.php index 47cb836b2..10f543419 100644 --- a/tests/Controllers/RepositoryFilterControllerTest.php +++ b/tests/Controllers/RepositoryFilterControllerTest.php @@ -86,7 +86,6 @@ public function test_available_filters_returns_only_matches_sortables_searches() $response = $this->getJson('posts/filters?only=searchables') ->assertJsonCount(2, 'data'); - } public function test_value_filter_doesnt_require_value() @@ -102,7 +101,7 @@ public function test_value_filter_doesnt_require_value() $response = $this ->withoutExceptionHandling() - ->getJson('posts?filters=' . $filters) + ->getJson('posts?filters='.$filters) ->assertStatus(200); $this->assertCount(1, $response->json('data')); @@ -124,7 +123,7 @@ public function test_the_boolean_filter_is_applied() $response = $this ->withoutExceptionHandling() - ->getJson('posts?filters=' . $filters) + ->getJson('posts?filters='.$filters) ->assertStatus(200); $this->assertCount(1, $response->json('data')); @@ -144,7 +143,7 @@ public function test_the_select_filter_is_applied() $response = $this ->withExceptionHandling() - ->getJson('posts?filters=' . $filters) + ->getJson('posts?filters='.$filters) ->assertStatus(200); $this->assertCount(1, $response->json('data'));