From a8890506b7aa79fd624d14f9ea884ec1ead67b08 Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Mon, 28 Dec 2020 10:36:05 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Eager/RelatedCollection.php | 15 +++++++-------- .../Controllers/RepositoryIndexControllerTest.php | 2 -- tests/Repositories/ActionLogRepositoryTest.php | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Eager/RelatedCollection.php b/src/Eager/RelatedCollection.php index 89de7e2d1..e5727186c 100644 --- a/src/Eager/RelatedCollection.php +++ b/src/Eager/RelatedCollection.php @@ -11,7 +11,6 @@ use Binaryk\LaravelRestify\Http\Requests\RestifyRequest; use Binaryk\LaravelRestify\Repositories\Repository; use Illuminate\Support\Collection; -use Illuminate\Support\Str; class RelatedCollection extends Collection { @@ -26,8 +25,8 @@ public function intoAssoc(): self public function forEager(RestifyRequest $request): self { - return $this->filter(fn($value, $key) => $value instanceof EagerField) - ->filter(fn(Field $field) => $field->authorize($request)) + return $this->filter(fn ($value, $key) => $value instanceof EagerField) + ->filter(fn (Field $field) => $field->authorize($request)) ->unique('attribute'); } @@ -35,15 +34,15 @@ public function forManyToManyRelations(RestifyRequest $request): self { return $this->filter(function ($field) { return $field instanceof BelongsToMany || $field instanceof MorphToMany; - })->filter(fn(EagerField $field) => $field->authorize($request)); + })->filter(fn (EagerField $field) => $field->authorize($request)); } public function mapIntoSortable(RestifyRequest $request): self { - return $this->filter(fn(EagerField $field) => $field->isSortable()) + return $this->filter(fn (EagerField $field) => $field->isSortable()) //Now we support only belongs to sort from related. - ->filter(fn(EagerField $field) => $field instanceof BelongsTo) - ->map(fn(BelongsTo $field) => SortableFilter::make()->usingBelongsTo($field)); + ->filter(fn (EagerField $field) => $field instanceof BelongsTo) + ->map(fn (BelongsTo $field) => SortableFilter::make()->usingBelongsTo($field)); } public function forShow(RestifyRequest $request, Repository $repository): self @@ -85,6 +84,6 @@ public function mapIntoRelated(RestifyRequest $request) public function authorized(RestifyRequest $request) { return $this->intoAssoc() - ->filter(fn($key, $value) => $key instanceof EagerField ? $key->authorize($request) : true); + ->filter(fn ($key, $value) => $key instanceof EagerField ? $key->authorize($request) : true); } } diff --git a/tests/Controllers/RepositoryIndexControllerTest.php b/tests/Controllers/RepositoryIndexControllerTest.php index 3a2dfbd07..705aee725 100644 --- a/tests/Controllers/RepositoryIndexControllerTest.php +++ b/tests/Controllers/RepositoryIndexControllerTest.php @@ -2,14 +2,12 @@ namespace Binaryk\LaravelRestify\Tests\Controllers; -use Binaryk\LaravelRestify\Fields\HasMany; use Binaryk\LaravelRestify\Tests\Fixtures\Company\Company; use Binaryk\LaravelRestify\Tests\Fixtures\Company\CompanyRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post; use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\RelatedCastWithAttributes; use Binaryk\LaravelRestify\Tests\Fixtures\User\User; -use Binaryk\LaravelRestify\Tests\Fixtures\User\UserRepository; use Binaryk\LaravelRestify\Tests\IntegrationTest; use Illuminate\Foundation\Testing\RefreshDatabase; diff --git a/tests/Repositories/ActionLogRepositoryTest.php b/tests/Repositories/ActionLogRepositoryTest.php index 15d3b52e2..40f5fc8a5 100644 --- a/tests/Repositories/ActionLogRepositoryTest.php +++ b/tests/Repositories/ActionLogRepositoryTest.php @@ -41,9 +41,9 @@ public function test_can_list_action_logs() 'name', 'user_id', 'actionable_type', - 'actionable_id' + 'actionable_id', ], - ] + ], ], ])->json('data'); }