From b59cfdc207093664e8c7be7e0822e26df4edbf0c Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Wed, 23 Dec 2020 16:25:05 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Eager/RelatedCollection.php | 14 +++++----- src/Fields/Concerns/Attachable.php | 1 - src/Fields/Field.php | 2 +- .../RepositoryAttachController.php | 4 +-- .../Concerns/InteractsWithAttachers.php | 4 +-- src/Repositories/ValidatingTrait.php | 11 ++++---- .../RepositoryAttachControllerTest.php | 28 +++++++++---------- .../RepositoryDetachControllerTest.php | 20 ++++++------- tests/Fields/BelongsToManyFieldTest.php | 25 ++++++++--------- tests/Fixtures/Company/CompanyRepository.php | 10 +++---- tests/Fixtures/User/User.php | 1 - tests/IntegrationTest.php | 1 - 12 files changed, 57 insertions(+), 64 deletions(-) diff --git a/src/Eager/RelatedCollection.php b/src/Eager/RelatedCollection.php index aa7f9219d..e5727186c 100644 --- a/src/Eager/RelatedCollection.php +++ b/src/Eager/RelatedCollection.php @@ -25,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'); } @@ -39,10 +39,10 @@ public function forManyToManyRelations(RestifyRequest $request): self 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 @@ -70,7 +70,7 @@ public function forIndex(RestifyRequest $request, Repository $repository): self public function inRequest(RestifyRequest $request): self { return $this - ->filter(fn($field, $key) => in_array($key, str_getcsv($request->input('related')))) + ->filter(fn ($field, $key) => in_array($key, str_getcsv($request->input('related')))) ->unique(); } @@ -84,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/src/Fields/Concerns/Attachable.php b/src/Fields/Concerns/Attachable.php index a4a9694f8..52c6d7398 100644 --- a/src/Fields/Concerns/Attachable.php +++ b/src/Fields/Concerns/Attachable.php @@ -9,7 +9,6 @@ use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Database\Eloquent\Relations\Pivot; use Illuminate\Support\Arr; -use Illuminate\Support\Collection; trait Attachable { diff --git a/src/Fields/Field.php b/src/Fields/Field.php index f2be0bb43..0db7ac771 100644 --- a/src/Fields/Field.php +++ b/src/Fields/Field.php @@ -386,7 +386,7 @@ public function serializeMessages(): array $messages = []; foreach ($this->messages as $ruleFor => $message) { - $messages[$this->getAttribute() . '.' . $ruleFor] = $message; + $messages[$this->getAttribute().'.'.$ruleFor] = $message; } return $messages; diff --git a/src/Http/Controllers/RepositoryAttachController.php b/src/Http/Controllers/RepositoryAttachController.php index 35c29a6b5..a6fd612e3 100644 --- a/src/Http/Controllers/RepositoryAttachController.php +++ b/src/Http/Controllers/RepositoryAttachController.php @@ -24,8 +24,8 @@ public function __invoke(RepositoryAttachRequest $request) return $repository->attach( $request, $request->repositoryId, collect(Arr::wrap($request->input($request->relatedRepository))) - ->filter(fn($relatedRepositoryId) => $request->repository()->allowToAttach($request, $request->attachRelatedModels())) - ->map(fn($relatedRepositoryId) => $this->belongsToManyField($request) + ->filter(fn ($relatedRepositoryId) => $request->repository()->allowToAttach($request, $request->attachRelatedModels())) + ->map(fn ($relatedRepositoryId) => $this->belongsToManyField($request) ->initializePivot( $request, $model->{$request->viaRelationship ?? $request->relatedRepository}(), $relatedRepositoryId )) diff --git a/src/Repositories/Concerns/InteractsWithAttachers.php b/src/Repositories/Concerns/InteractsWithAttachers.php index 1af9951b4..1a8863059 100644 --- a/src/Repositories/Concerns/InteractsWithAttachers.php +++ b/src/Repositories/Concerns/InteractsWithAttachers.php @@ -43,7 +43,7 @@ public function guessAttachMethod(RestifyRequest $request): ?callable return $cb; } - $methodGuesser = 'attach' . Str::studly($request->relatedRepository); + $methodGuesser = 'attach'.Str::studly($request->relatedRepository); if (method_exists($repository, $methodGuesser)) { return [$repository, $methodGuesser]; @@ -66,7 +66,7 @@ public function guessDetachMethod(RestifyRequest $request): ?callable return $cb; } - $methodGuesser = 'detach' . Str::studly($request->relatedRepository); + $methodGuesser = 'detach'.Str::studly($request->relatedRepository); if (method_exists($repository, $methodGuesser)) { return [$repository, $methodGuesser]; diff --git a/src/Repositories/ValidatingTrait.php b/src/Repositories/ValidatingTrait.php index 2725273cf..45e26bb50 100644 --- a/src/Repositories/ValidatingTrait.php +++ b/src/Repositories/ValidatingTrait.php @@ -34,7 +34,7 @@ public static function validatorForStoring(RestifyRequest $request, array $plain $messages = $on->collectFields($request)->flatMap(function ($k) { $messages = []; foreach ($k->messages as $ruleFor => $message) { - $messages[$k->attribute . '.' . $ruleFor] = $message; + $messages[$k->attribute.'.'.$ruleFor] = $message; } return $messages; @@ -54,7 +54,7 @@ public static function validatorForStoringBulk(RestifyRequest $request, array $p $messages = $on->collectFields($request)->flatMap(function ($k) { $messages = []; foreach ($k->messages as $ruleFor => $message) { - $messages['*' . $k->attribute . '.' . $ruleFor] = $message; + $messages['*'.$k->attribute.'.'.$ruleFor] = $message; } return $messages; @@ -84,7 +84,7 @@ public static function validatorForUpdate(RestifyRequest $request, $resource = n $messages = $on->collectFields($request)->flatMap(function ($k) { $messages = []; foreach ($k->messages as $ruleFor => $message) { - $messages[$k->attribute . '.' . $ruleFor] = $message; + $messages[$k->attribute.'.'.$ruleFor] = $message; } return $messages; @@ -101,7 +101,6 @@ public static function validatorForAttach(RestifyRequest $request, $resource = n /** * @var Repository $on */ $on = $resource ?? static::resolveWith(static::newModel()); - /** * @var BelongsToMany $field */ $field = $on::collectRelated() ->forManyToManyRelations($request) @@ -109,7 +108,7 @@ public static function validatorForAttach(RestifyRequest $request, $resource = n $pivotFields = $field->collectPivotFields(); - $messages = $pivotFields->flatMap(fn(Field $field) => $field->serializeMessages())->all(); + $messages = $pivotFields->flatMap(fn (Field $field) => $field->serializeMessages())->all(); $rules = $pivotFields->mapWithKeys(function (Field $k) { return [ @@ -131,7 +130,7 @@ public static function validatorForUpdateBulk(RestifyRequest $request, $resource $messages = $on->collectFields($request)->flatMap(function ($k) { $messages = []; foreach ($k->messages as $ruleFor => $message) { - $messages['*' . $k->attribute . '.' . $ruleFor] = $message; + $messages['*'.$k->attribute.'.'.$ruleFor] = $message; } return $messages; diff --git a/tests/Controllers/RepositoryAttachControllerTest.php b/tests/Controllers/RepositoryAttachControllerTest.php index 89f9c727f..c496b2f53 100644 --- a/tests/Controllers/RepositoryAttachControllerTest.php +++ b/tests/Controllers/RepositoryAttachControllerTest.php @@ -21,7 +21,7 @@ public function test_can_attach_repositories() $user = $this->mockUsers()->first(); $company = factory(Company::class)->create(); - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ])->assertCreated()->assertJsonFragment([ @@ -46,14 +46,14 @@ public function test_cant_attach_repositories_not_authorized_to_attach() $_SERVER['allow_attach_users'] = false; - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ])->assertForbidden(); $_SERVER['allow_attach_users'] = true; - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ])->assertCreated(); @@ -73,15 +73,15 @@ public function test_attach_pivot_field_validation() Field::make('is_admin')->rules('required')->messages([ 'required' => $message = 'You should fill the is_admin information.', ]) - ) + ), ]); - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, ])->assertStatus(400)->assertJsonFragment([ 'is_admin' => [ - $message - ]]); + $message, + ], ]); } public function test_pivot_field_present_when_show() @@ -93,7 +93,7 @@ public function test_pivot_field_present_when_show() $company->users()->attach($this->mockUsers()->first()->id); }); - $response = $this->getJson('companies/' . $company->id . '?related=users') + $response = $this->getJson('companies/'.$company->id.'?related=users') ->assertOk(); $this->assertSame( @@ -136,7 +136,7 @@ public function test_attach_multiple_users_to_a_company() $this->assertCount(0, $company->users); - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => [1, 2], 'is_admin' => true, ])->assertCreated()->assertJsonFragment([ @@ -162,10 +162,10 @@ public function test_many_to_many_field_can_intercept_attach_authorization() $this->assertInstanceOf(Pivot::class, $pivot); return false; - }) + }), ]); - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ])->assertForbidden(); @@ -192,10 +192,10 @@ public function test_many_to_many_field_can_intercept_attach_method() $this->assertInstanceOf(Company::class, $model); $model->users()->attach($request->input('users')); - }) + }), ]); - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, 'is_admin' => true, ])->assertOk(); @@ -223,7 +223,7 @@ public function test_repository_can_intercept_attach() }, ]; - $this->postJson('companies/' . $company->id . '/attach/users', [ + $this->postJson('companies/'.$company->id.'/attach/users', [ 'users' => $user->id, ])->assertOk(); diff --git a/tests/Controllers/RepositoryDetachControllerTest.php b/tests/Controllers/RepositoryDetachControllerTest.php index ead589956..5cfed3241 100644 --- a/tests/Controllers/RepositoryDetachControllerTest.php +++ b/tests/Controllers/RepositoryDetachControllerTest.php @@ -28,8 +28,8 @@ public function test_can_detach_repositories() $this->assertCount(2, $company->users); - $this->postJson('companies/' . $company->id . '/detach/users', [ - 'users' => [1, 2] + $this->postJson('companies/'.$company->id.'/detach/users', [ + 'users' => [1, 2], ])->assertNoContent(); $this->assertCount(0, $company->fresh()->users); @@ -52,8 +52,8 @@ public function test_cant_detach_repositories_not_authorized_to_detach() $_SERVER['allow_detach_users'] = false; - $this->postJson('companies/' . $company->id . '/detach/users', [ - 'users' => [1, 2] + $this->postJson('companies/'.$company->id.'/detach/users', [ + 'users' => [1, 2], ])->assertForbidden(); } @@ -74,8 +74,8 @@ public function test_many_to_many_field_can_intercept_detach_authorization() $company->users()->attach($this->mockUsers()->first()->id); }); - $this->postJson('companies/' . $company->id . '/detach/users', [ - 'users' => [1] + $this->postJson('companies/'.$company->id.'/detach/users', [ + 'users' => [1], ])->assertForbidden(); } @@ -99,8 +99,8 @@ public function test_many_to_many_field_can_intercept_detach_method() $company->users()->attach($this->mockUsers()->first()->id); }); - $this->postJson('companies/' . $company->id . '/detach/users', [ - 'users' => [1] + $this->postJson('companies/'.$company->id.'/detach/users', [ + 'users' => [1], ])->assertNoContent(); $this->assertCount(0, $company->fresh()->users); @@ -130,8 +130,8 @@ public function test_repository_can_intercept_detach() $company->users()->attach($this->mockUsers()->first()->id); }); - $this->postJson('companies/' . $company->id . '/detach/users', [ - 'users' => [1] + $this->postJson('companies/'.$company->id.'/detach/users', [ + 'users' => [1], ])->assertNoContent(); $this->assertCount(0, $company->fresh()->users); diff --git a/tests/Fields/BelongsToManyFieldTest.php b/tests/Fields/BelongsToManyFieldTest.php index 8637db251..6468d1a67 100644 --- a/tests/Fields/BelongsToManyFieldTest.php +++ b/tests/Fields/BelongsToManyFieldTest.php @@ -3,9 +3,6 @@ namespace Binaryk\LaravelRestify\Tests\Fields; use Binaryk\LaravelRestify\Fields\BelongsToMany; -use Binaryk\LaravelRestify\Http\Requests\RestifyRequest; -use Binaryk\LaravelRestify\Repositories\Repository; -use Binaryk\LaravelRestify\Restify; use Binaryk\LaravelRestify\Tests\Fixtures\Company\Company; use Binaryk\LaravelRestify\Tests\Fixtures\Company\CompanyRepository; use Binaryk\LaravelRestify\Tests\Fixtures\User\User; @@ -22,7 +19,7 @@ public function test_belongs_to_many_displays_on_relationships_show() ); }); - $this->get(CompanyRepository::uriKey() . "/{$company->id}?related=users") + $this->get(CompanyRepository::uriKey()."/{$company->id}?related=users") ->assertJsonStructure([ 'data' => [ 'relationships' => [ @@ -46,11 +43,11 @@ public function test_belongs_to_many_can_hide_relationships_from_show() 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->hideFromShow(), ]); - $this->get(CompanyRepository::uriKey() . "/{$company->id}?related=users") + $this->get(CompanyRepository::uriKey()."/{$company->id}?related=users") ->assertJsonStructure([ 'data' => [], ])->assertJsonMissing([ - 'users' + 'users', ]); } @@ -65,21 +62,21 @@ public function test_belongs_to_many_can_hide_relationships_from_index() CompanyRepository::partialMock() ->expects('related') ->andReturn([ - 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->hideFromIndex() + 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->hideFromIndex(), ]); - $this->get(CompanyRepository::uriKey() . "?related=users")->assertJsonMissing([ - 'users' + $this->get(CompanyRepository::uriKey().'?related=users')->assertJsonMissing([ + 'users', ]); CompanyRepository::partialMock() ->expects('related') ->andReturn([ - 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->hideFromShow() + 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->hideFromShow(), ]); - $this->get(CompanyRepository::uriKey() . "?related=users")->assertJsonFragment([ - 'users' + $this->get(CompanyRepository::uriKey().'?related=users')->assertJsonFragment([ + 'users', ]); } @@ -91,7 +88,7 @@ public function test_belongs_to_many_generates_nested_uri() ); }); - $response = $this->get(CompanyRepository::uriKey() . "/{$company->id}/users") + $response = $this->get(CompanyRepository::uriKey()."/{$company->id}/users") ->dump() ->assertOk(); @@ -117,7 +114,7 @@ public function test_belongs_to_many_ignored_when_storing() [ 'relationships' => [ 'users' => [], - ],], + ], ], ]); } } diff --git a/tests/Fixtures/Company/CompanyRepository.php b/tests/Fixtures/Company/CompanyRepository.php index 988351147..4d1802d0e 100644 --- a/tests/Fixtures/Company/CompanyRepository.php +++ b/tests/Fixtures/Company/CompanyRepository.php @@ -17,7 +17,7 @@ public static function related(): array return [ 'users' => BelongsToMany::make('users', 'users', UserRepository::class)->withPivot( Field::make('is_admin')->rules('required') - )->canDetach(fn($request, $pivot) => isset($_SERVER['roles.canDetach.users']) && $_SERVER['roles.canDetach.users']), + )->canDetach(fn ($request, $pivot) => isset($_SERVER['roles.canDetach.users']) && $_SERVER['roles.canDetach.users']), ]; } @@ -25,10 +25,10 @@ public function fields(RestifyRequest $request) { return [ field('name'), -// -// BelongsToMany::make('users', 'users', UserRepository::class)->withPivot( -// Field::make('is_admin')->rules('required') -// )->canDetach(fn($request, $pivot) => $_SERVER['roles.canDetach.users']), + // + // BelongsToMany::make('users', 'users', UserRepository::class)->withPivot( + // Field::make('is_admin')->rules('required') + // )->canDetach(fn($request, $pivot) => $_SERVER['roles.canDetach.users']), ]; } } diff --git a/tests/Fixtures/User/User.php b/tests/Fixtures/User/User.php index a4b793c7b..6e5a97c6c 100644 --- a/tests/Fixtures/User/User.php +++ b/tests/Fixtures/User/User.php @@ -9,7 +9,6 @@ use Binaryk\LaravelRestify\Tests\Fixtures\Role\Role; use Binaryk\LaravelRestify\Traits\InteractWithSearch; use Illuminate\Contracts\Auth\MustVerifyEmail; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Query\Builder; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php index 8705baa5c..dce19f7c1 100644 --- a/tests/IntegrationTest.php +++ b/tests/IntegrationTest.php @@ -23,7 +23,6 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Route; -use Illuminate\Testing\Assert as PHPUnit; use Mockery; use Orchestra\Testbench\TestCase;