From 1aacf86d43818564259d13a2380a5cc9d6ada7c6 Mon Sep 17 00:00:00 2001 From: Lupacescu Eduard Date: Tue, 5 May 2020 20:48:01 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Repositories/Repository.php | 14 +++++++------- src/Traits/AuthorizableModels.php | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php index 54f30b7c1..b27d25f4f 100644 --- a/src/Repositories/Repository.php +++ b/src/Repositories/Repository.php @@ -290,7 +290,7 @@ public function resolveRelationships($request): array /** * @var AbstractPaginator $paginator */ $paginator = $this->resource->{$relation}()->paginate($request->get('relatablePerPage') ?? (static::$defaultRelatablePerPage ?? RestifySearchable::DEFAULT_RELATABLE_PER_PAGE)); - $withs[$relation] = $paginator->getCollection()->map(fn(Model $item) => [ + $withs[$relation] = $paginator->getCollection()->map(fn (Model $item) => [ 'attributes' => $item->toArray(), ]); } @@ -335,7 +335,7 @@ public function serializeIndex(RestifyRequest $request): array }), 'type' => $this->model()->getTable(), 'attributes' => $this->resolveIndexAttributes($request), - 'relationships' => $this->when(!empty($relations), $relations), + 'relationships' => $this->when(! empty($relations), $relations), 'meta' => $this->when(value($this->resolveDetailsMeta($request)), $this->resolveDetailsMeta($request)), ]; } @@ -352,11 +352,11 @@ public function resolveIndexAttributes($request) // Resolve the show method, and attach the value to the array $this->collectFields($request) - ->filter(fn(Field $field) => !$field->isHiddenOnIndex($request, static::class)) + ->filter(fn (Field $field) => ! $field->isHiddenOnIndex($request, static::class)) ->each(function (Field $field) use (&$resolvedAttributes) { $resolvedAttributes[$field->attribute] = $field->resolveForIndex($this)->value; }); - $hidden = $this->collectFields($request)->filter(fn(Field $field) => $field->isHiddenOnIndex($request, $this))->pluck('attribute')->toArray(); + $hidden = $this->collectFields($request)->filter(fn (Field $field) => $field->isHiddenOnIndex($request, $this))->pluck('attribute')->toArray(); return Arr::except($resolvedAttributes, $hidden); } @@ -396,7 +396,7 @@ public function index(RestifyRequest $request) return static::resolveWith($value); })->filter(function (self $repository) use ($request) { return $repository->authorizedToShow($request); - })->values()->map(fn(self $item) => $this->filter($item->serializeIndex($request))); + })->values()->map(fn (self $item) => $this->filter($item->serializeIndex($request))); return $this->response([ 'meta' => RepositoryCollection::meta($paginator->toArray()), @@ -443,7 +443,7 @@ public function store(RestifyRequest $request) return $this->response('', RestResponse::REST_RESPONSE_CREATED_CODE) ->model($this->resource) - ->header('Location', Restify::path() . '/' . static::uriKey() . '/' . $this->resource->id); + ->header('Location', Restify::path().'/'.static::uriKey().'/'.$this->resource->id); } public function update(RestifyRequest $request, $repositoryId) @@ -632,7 +632,7 @@ public function resolve($request = null) $data = $data->jsonSerialize(); } - return $this->filter((array)$data); + return $this->filter((array) $data); } public function response($content = '', $status = 200, array $headers = []): RestResponse diff --git a/src/Traits/AuthorizableModels.php b/src/Traits/AuthorizableModels.php index 274fd801e..510fb5783 100644 --- a/src/Traits/AuthorizableModels.php +++ b/src/Traits/AuthorizableModels.php @@ -5,7 +5,6 @@ use Binaryk\LaravelRestify\Repositories\Repository; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate;