From 64a771c9f9d700491970d9ac73348e764bdc28da Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Sun, 24 May 2020 15:42:49 +0000 Subject: [PATCH] Apply fixes from StyleCI --- config/config.php | 1 - src/Http/Controllers/ProfileAvatarController.php | 1 - src/Http/Requests/InteractWithRepositories.php | 7 +++---- tests/Controllers/RepositoryMiddlewaresTest.php | 4 +--- tests/Fixtures/Post/PostWithCustomMiddlewareRepository.php | 1 - tests/IntegrationTest.php | 1 - 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/config/config.php b/config/config.php index 598f7bde0..8c10001d1 100644 --- a/config/config.php +++ b/config/config.php @@ -2,7 +2,6 @@ use Binaryk\LaravelRestify\Http\Middleware\AuthorizeRestify; use Binaryk\LaravelRestify\Http\Middleware\DispatchRestifyStartingEvent; -use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostMiddleware; return [ 'auth' => [ diff --git a/src/Http/Controllers/ProfileAvatarController.php b/src/Http/Controllers/ProfileAvatarController.php index 63c7bc7c2..8463a5a78 100644 --- a/src/Http/Controllers/ProfileAvatarController.php +++ b/src/Http/Controllers/ProfileAvatarController.php @@ -23,7 +23,6 @@ public function __invoke(ProfileAvatarRequest $request) $user->{$request::$userAvatarAttribute} = $path; $user->save(); - $user->{ProfileAvatarRequest::$userAvatarAttribute} = url($user->{ProfileAvatarRequest::$userAvatarAttribute}); return $this->response()->model($user); diff --git a/src/Http/Requests/InteractWithRepositories.php b/src/Http/Requests/InteractWithRepositories.php index 599829b02..5d3e95ddd 100644 --- a/src/Http/Requests/InteractWithRepositories.php +++ b/src/Http/Requests/InteractWithRepositories.php @@ -8,7 +8,6 @@ use Binaryk\LaravelRestify\Restify; use Illuminate\Database\Eloquent\Model; use Illuminate\Pipeline\Pipeline; -use Throwable; /** * @author Eduard Lupacescu @@ -46,7 +45,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); @@ -121,7 +120,7 @@ public function newRepositoryWith($model, $uriKey = null) */ public function newQueryWithoutScopes($uriKey = null) { - if (!$this->isViaRepository()) { + if (! $this->isViaRepository()) { return $this->model($uriKey)->newQueryWithoutScopes(); } @@ -188,7 +187,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() diff --git a/tests/Controllers/RepositoryMiddlewaresTest.php b/tests/Controllers/RepositoryMiddlewaresTest.php index 5246a33c7..ce52bd2a5 100644 --- a/tests/Controllers/RepositoryMiddlewaresTest.php +++ b/tests/Controllers/RepositoryMiddlewaresTest.php @@ -7,7 +7,6 @@ use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostWithCustomMiddlewareRepository; use Binaryk\LaravelRestify\Tests\IntegrationTest; use Mockery as m; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class RepositoryMiddlewaresTest extends IntegrationTest { @@ -41,7 +40,7 @@ public function test_repository_can_have_custom_middleware() public function test_request_fails_if_middleware_abort() { PostWithCustomMiddlewareRepository::$middlewares = [ - PostAbortMiddleware::class + PostAbortMiddleware::class, ]; Restify::repositories([ @@ -54,7 +53,6 @@ public function test_request_fails_if_middleware_abort() public function test_foreign_repository_middleware_should_not_be_invoked() { - $middleware = m::mock(PostAbortMiddleware::class); $nextParam = null; diff --git a/tests/Fixtures/Post/PostWithCustomMiddlewareRepository.php b/tests/Fixtures/Post/PostWithCustomMiddlewareRepository.php index 537533d7c..4b886f9fb 100644 --- a/tests/Fixtures/Post/PostWithCustomMiddlewareRepository.php +++ b/tests/Fixtures/Post/PostWithCustomMiddlewareRepository.php @@ -16,7 +16,6 @@ class PostWithCustomMiddlewareRepository extends Repository public static $uriKey = 'post-with-middleware'; - public function fields(RestifyRequest $request) { return [ diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php index 65b639a97..4f69f6677 100644 --- a/tests/IntegrationTest.php +++ b/tests/IntegrationTest.php @@ -11,7 +11,6 @@ use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostMergeableRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostUnauthorizedFieldRepository; -use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostWithCustomMiddlewareRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostWithHiddenFieldRepository; use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostWithUnauthorizedFieldsRepository; use Binaryk\LaravelRestify\Tests\Fixtures\User\User;