diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php index f8328b9e2..f7da7b7c6 100644 --- a/src/Repositories/Repository.php +++ b/src/Repositories/Repository.php @@ -26,7 +26,6 @@ use Illuminate\Http\Resources\DelegatesToResource; use Illuminate\Pagination\AbstractPaginator; use Illuminate\Routing\Router; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; @@ -161,14 +160,14 @@ public function collectFields(RestifyRequest $request) private function indexFields(RestifyRequest $request): Collection { return $this->collectFields($request) - ->filter(fn(Field $field) => !$field->isHiddenOnIndex($request, $this)) + ->filter(fn (Field $field) => ! $field->isHiddenOnIndex($request, $this)) ->values(); } private function showFields(RestifyRequest $request): Collection { return $this->collectFields($request) - ->filter(fn(Field $field) => !$field->isHiddenOnDetail($request, $this)) + ->filter(fn (Field $field) => ! $field->isHiddenOnDetail($request, $this)) ->values(); } @@ -254,10 +253,10 @@ public static function routes(Router $router, $attributes, $wrap = false) public function resolveDetailsAttributes(RestifyRequest $request) { $fields = $this->showFields($request) - ->filter(fn(Field $field) => $field->authorize($request)) - ->each(fn(Field $field) => $field->resolveForShow($this)) - ->map(fn(Field $field) => $field->serializeToValue($request)) - ->mapWithKeys(fn($value) => $value) + ->filter(fn (Field $field) => $field->authorize($request)) + ->each(fn (Field $field) => $field->resolveForShow($this)) + ->map(fn (Field $field) => $field->serializeToValue($request)) + ->mapWithKeys(fn ($value) => $value) ->all(); if ($this instanceof Mergeable) { @@ -275,7 +274,7 @@ public function resolveDetailsAttributes(RestifyRequest $request) return false; } - if (!$field->authorize($request)) { + if (! $field->authorize($request)) { return false; } @@ -296,10 +295,10 @@ public function resolveIndexAttributes($request) { // Resolve the show method, and attach the value to the array $fields = $this->indexFields($request) - ->filter(fn(Field $field) => $field->authorize($request)) - ->each(fn(Field $field) => $field->resolveForIndex($this)) - ->map(fn(Field $field) => $field->serializeToValue($request)) - ->mapWithKeys(fn($value) => $value) + ->filter(fn (Field $field) => $field->authorize($request)) + ->each(fn (Field $field) => $field->resolveForIndex($this)) + ->map(fn (Field $field) => $field->serializeToValue($request)) + ->mapWithKeys(fn ($value) => $value) ->all(); if ($this instanceof Mergeable) { @@ -317,7 +316,7 @@ public function resolveIndexAttributes($request) return false; } - if (!$field->authorize($request)) { + if (! $field->authorize($request)) { return false; } @@ -363,7 +362,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(), ]); } @@ -450,7 +449,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) @@ -631,7 +630,7 @@ public function jsonSerialize() $data = $data->jsonSerialize(); } - return $this->filter((array)$data); + return $this->filter((array) $data); } private function modelAttributes(Request $request = null): Collection diff --git a/tests/Controllers/RepositoryShowControllerTest.php b/tests/Controllers/RepositoryShowControllerTest.php index f2c19a55f..c6a27a044 100644 --- a/tests/Controllers/RepositoryShowControllerTest.php +++ b/tests/Controllers/RepositoryShowControllerTest.php @@ -2,7 +2,6 @@ namespace Binaryk\LaravelRestify\Tests\Controllers; -use Binaryk\LaravelRestify\Exceptions\RestifyHandler; use Binaryk\LaravelRestify\Fields\Field; use Binaryk\LaravelRestify\Http\Requests\RestifyRequest; use Binaryk\LaravelRestify\Repositories\Mergeable; @@ -11,7 +10,6 @@ use Binaryk\LaravelRestify\Tests\Fixtures\Apple; use Binaryk\LaravelRestify\Tests\Fixtures\Post; use Binaryk\LaravelRestify\Tests\IntegrationTest; -use Illuminate\Contracts\Debug\ExceptionHandler; /** * @author Eduard Lupacescu @@ -118,8 +116,8 @@ class AppleAuthorized extends Repository public function fields(RestifyRequest $request) { return [ - Field::make('title')->canSee(fn() => $_SERVER['can.see.title'] ?? true) - ->showCallback(fn($value) => strtoupper($value)), + Field::make('title')->canSee(fn () => $_SERVER['can.see.title'] ?? true) + ->showCallback(fn ($value) => strtoupper($value)), ]; } }