Skip to content

Apply fixes from StyleCI #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2020
Merged

Apply fixes from StyleCI #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/Http/Controllers/RepositoryFilterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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));
})
);
}
Expand Down
7 changes: 3 additions & 4 deletions tests/Controllers/RepositoryFilterControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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'));
Expand All @@ -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'));
Expand All @@ -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'));
Expand Down