From 5917037318eceeed0ee5b9420cccd943e8bcb3ef Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Tue, 19 May 2020 21:29:59 +0000 Subject: [PATCH] Apply fixes from StyleCI --- routes/api.php | 21 +++++++++---------- .../RepositoryAttachController.php | 3 +-- .../Requests/InteractWithRepositories.php | 10 +++------ src/Http/Requests/RepositoryAttachRequest.php | 1 - src/Repositories/Repository.php | 5 ++--- .../RepositoryPivotControllerTest.php | 6 +++--- tests/Fixtures/Company/Company.php | 2 +- tests/Fixtures/User/User.php | 2 +- 8 files changed, 21 insertions(+), 29 deletions(-) diff --git a/routes/api.php b/routes/api.php index ca1fc4eb6..fa01dfe90 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,29 +1,28 @@ attach( $request, $request->repositoryId, collect(Arr::wrap($request->input($request->relatedRepository))) - ->map(fn($relatedRepositoryId) => $this->initializePivot( + ->map(fn ($relatedRepositoryId) => $this->initializePivot( $request, $model->{$request->viaRelationship ?? $request->relatedRepository}(), $relatedRepositoryId )) ); @@ -61,5 +61,4 @@ protected function initializePivot(RestifyRequest $request, $relationship, $rela return $pivot; } - } diff --git a/src/Http/Requests/InteractWithRepositories.php b/src/Http/Requests/InteractWithRepositories.php index cf7009273..7d2030908 100644 --- a/src/Http/Requests/InteractWithRepositories.php +++ b/src/Http/Requests/InteractWithRepositories.php @@ -44,7 +44,7 @@ public function repository($key = null): ?Repository ]), 404); } - if (!$repository::authorizedToUseRepository($this)) { + if (! $repository::authorizedToUseRepository($this)) { throw new UnauthorizedException(__('Unauthorized to view repository :name. See "allowRestify" policy.', [ 'name' => $repository, ]), 403); @@ -114,7 +114,7 @@ public function newRepositoryWith($model, $uriKey = null) */ public function newQueryWithoutScopes($uriKey = null) { - if (!$this->isViaRepository()) { + if (! $this->isViaRepository()) { return $this->model($uriKey)->newQueryWithoutScopes(); } @@ -170,7 +170,6 @@ public function findRelatedModelOrFail() }); } - public function findRelatedQuery($relatedRepository = null, $relatedRepositoryId = null) { return $this->repository($relatedRepository ?? request('relatedRepository'))::newModel() @@ -178,7 +177,6 @@ public function findRelatedQuery($relatedRepository = null, $relatedRepositoryId ->whereKey($relatedRepositoryId ?? request('relatedRepositoryId')); } - protected function findPivot(RestifyRequest $request, $model) { $pivot = $model->{$request->relatedRepository}()->getPivotAccessor(); @@ -193,7 +191,7 @@ public function viaParentModel() { $parent = $this->repository($this->viaRepository); - return once(fn() => $parent::newModel()->newQueryWithoutScopes()->whereKey($this->viaRepositoryId)->firstOrFail()); + return once(fn () => $parent::newModel()->newQueryWithoutScopes()->whereKey($this->viaRepositoryId)->firstOrFail()); } public function viaQuery() @@ -217,6 +215,4 @@ public function relatedRepository() { return Restify::repositoryForKey($this->relatedRepository); } - - } diff --git a/src/Http/Requests/RepositoryAttachRequest.php b/src/Http/Requests/RepositoryAttachRequest.php index 1586752ae..972af0822 100644 --- a/src/Http/Requests/RepositoryAttachRequest.php +++ b/src/Http/Requests/RepositoryAttachRequest.php @@ -4,5 +4,4 @@ class RepositoryAttachRequest extends RestifyRequest { - } diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php index 097726cb3..da83f4911 100644 --- a/src/Repositories/Repository.php +++ b/src/Repositories/Repository.php @@ -8,7 +8,6 @@ use Binaryk\LaravelRestify\Fields\Field; use Binaryk\LaravelRestify\Fields\FieldCollection; use Binaryk\LaravelRestify\Filter; -use Binaryk\LaravelRestify\Http\Requests\RepositoryAttachRequest; use Binaryk\LaravelRestify\Http\Requests\RestifyRequest; use Binaryk\LaravelRestify\Restify; use Binaryk\LaravelRestify\Services\Search\RepositorySearchService; @@ -578,8 +577,8 @@ public function update(RestifyRequest $request, $repositoryId) public function attach(RestifyRequest $request, $repositoryId, Collection $pivots) { DB::transaction(function () use ($request, $pivots) { - return $pivots->map(fn($pivot) => $pivot->forceFill($request->except($request->relatedRepository))) - ->map(fn($pivot) => $pivot->save()); + return $pivots->map(fn ($pivot) => $pivot->forceFill($request->except($request->relatedRepository))) + ->map(fn ($pivot) => $pivot->save()); }); return $this->response() diff --git a/tests/Controllers/RepositoryPivotControllerTest.php b/tests/Controllers/RepositoryPivotControllerTest.php index b6262b5ea..997065ad0 100644 --- a/tests/Controllers/RepositoryPivotControllerTest.php +++ b/tests/Controllers/RepositoryPivotControllerTest.php @@ -12,7 +12,7 @@ public function test_attach_a_user_to_a_company() $user = $this->mockUsers(2)->first(); $company = factory(Company::class)->create(); - $response = $this->postJson('restify-api/companies/' . $company->id . '/attach/users', [ + $response = $this->postJson('restify-api/companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ]) @@ -32,7 +32,7 @@ public function test_attach_multiple_users_to_a_company() $usersFromCompany = $this->getJson('/restify-api/users?viaRepository=companies&viaRepositoryId=1&viaRelationship=users'); $this->assertCount(0, $usersFromCompany->json('data')); - $response = $this->postJson('restify-api/companies/' . $company->id . '/attach/users', [ + $response = $this->postJson('restify-api/companies/'.$company->id.'/attach/users', [ 'users' => [1, 2], 'is_admin' => true, ]) @@ -56,7 +56,7 @@ public function test_after_attach_a_user_to_company_number_of_users_increased() $usersFromCompany = $this->getJson('/restify-api/users?viaRepository=companies&viaRepositoryId=1&viaRelationship=users'); $this->assertCount(0, $usersFromCompany->json('data')); - $this->postJson('restify-api/companies/' . $company->id . '/attach/users', [ + $this->postJson('restify-api/companies/'.$company->id.'/attach/users', [ 'users' => $user->id, ]); diff --git a/tests/Fixtures/Company/Company.php b/tests/Fixtures/Company/Company.php index 6caf50442..d1ed1dc86 100644 --- a/tests/Fixtures/Company/Company.php +++ b/tests/Fixtures/Company/Company.php @@ -16,7 +16,7 @@ public function users() { return $this->belongsToMany(User::class, 'company_user', 'company_id', 'user_id') ->withPivot([ - 'is_admin' + 'is_admin', ]) ->withTimestamps(); } diff --git a/tests/Fixtures/User/User.php b/tests/Fixtures/User/User.php index 39fea7f61..7cab46a0e 100644 --- a/tests/Fixtures/User/User.php +++ b/tests/Fixtures/User/User.php @@ -85,7 +85,7 @@ public function posts() public function companies() { return $this->belongsToMany(Company::class, 'company_user', 'user_id', 'company_id')->withPivot([ - 'is_admin' + 'is_admin', ])->withTimestamps(); }