Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Repositories/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
]);
}
Expand Down Expand Up @@ -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)),
];
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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()),
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Traits/AuthorizableModels.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down