Skip to content

Commit 81cc035

Browse files
binarykbinaryk
committed
fix: wip
2 parents 485f0b4 + 5c8b015 commit 81cc035

File tree

11 files changed

+73
-74
lines changed

11 files changed

+73
-74
lines changed

‎src/Fields/Concerns/CanLoadLazyRelationship.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function lazy(string $relationshipName = null): self
2121

2222
public function isLazy(RestifyRequest $request): bool
2323
{
24-
return !is_null($this->lazyRelationshipName);
24+
return ! is_null($this->lazyRelationshipName);
2525
}
2626

2727
public function getLazyRelationshipName(): ?string

‎src/Fields/EagerField.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct($attribute, ?string $parentRepository = null)
4545

4646
if (is_null($parentRepository)) {
4747
$this->repositoryClass = tap(Restify::repositoryClassForKey(str($attribute)->pluralStudly()->kebab()->toString()),
48-
fn($repository) => abort_unless($repository, 400, "Repository not found for the key [$attribute]."));
48+
fn ($repository) => abort_unless($repository, 400, "Repository not found for the key [$attribute]."));
4949
}
5050

5151
if (! isset($this->repositoryClass)) {
@@ -61,9 +61,9 @@ public function __construct($attribute, ?string $parentRepository = null)
6161
public function authorize(Request $request)
6262
{
6363
return call_user_func(
64-
[$this->repositoryClass, 'authorizedToUseRepository'],
65-
$request
66-
) && parent::authorize($request);
64+
[$this->repositoryClass, 'authorizedToUseRepository'],
65+
$request
66+
) && parent::authorize($request);
6767
}
6868

6969
public function resolve($repository, $attribute = null)

‎src/Fields/Field.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
class Field extends OrganicField implements JsonSerializable, Matchable, Sortable
2626
{
27+
use CanLoadLazyRelationship;
2728
use CanMatch;
2829
use CanSearch;
2930
use CanSort;
30-
use CanLoadLazyRelationship;
3131
use FieldMcpSchemaDetection;
3232
use HasAction;
3333
use Make;

‎src/Filters/SearchablesCollection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function qualifyColumns(Model $model): self
138138
public function onlyBelongsTo(): self
139139
{
140140
return $this->filter(
141-
fn(SearchableFilter $filter) => $filter->hasBelongsTo()
141+
fn (SearchableFilter $filter) => $filter->hasBelongsTo()
142142
);
143143
}
144144
}

‎src/Http/Controllers/RepositoryShowController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function __invoke(RepositoryShowRequest $request): Response
1111
{
1212
$repository = $request->repository();
1313

14-
return $request->repositoryWith(tap($request->modelQuery(), fn($query) => $repository::showQuery(
14+
return $request->repositoryWith(tap($request->modelQuery(), fn ($query) => $repository::showQuery(
1515
$request,
1616
$repository::mainQuery($request, $query->with($repository::collectWiths($request, $repository)->all()))
1717
))->with($repository::collectWiths($request, $repository)->all())->firstOrFail())

‎src/Http/Controllers/RestResponse.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Binaryk\LaravelRestify\Http\Controllers;
44

55
use Binaryk\LaravelRestify\Contracts\RestifySearchable;
6-
use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
76
use Binaryk\LaravelRestify\Repositories\Repository;
87
use Binaryk\LaravelRestify\Repositories\RepositoryCollection;
98
use Illuminate\Contracts\Pagination\Paginator;

‎src/Repositories/Repository.php‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,10 @@ public function resolveShowAttributes(RestifyRequest $request)
428428
{
429429
$fields = $this->collectFields($request)
430430
->forShow($request, $this)
431-
->filter(fn(Field $field) => $field->authorize($request))
432-
->each(fn(Field $field) => $field->resolveForShow($this))
433-
->map(fn(Field $field) => $field->serializeToValue($request))
434-
->mapWithKeys(fn($value) => $value)
431+
->filter(fn (Field $field) => $field->authorize($request))
432+
->each(fn (Field $field) => $field->resolveForShow($this))
433+
->map(fn (Field $field) => $field->serializeToValue($request))
434+
->mapWithKeys(fn ($value) => $value)
435435
->all();
436436

437437
if ($this instanceof Mergeable) {
@@ -496,17 +496,17 @@ public function resolveIndexAttributes($request)
496496
->collectFields($request)
497497
->when(
498498
$this->hasCustomColumns(),
499-
fn(FieldCollection $fields) => $fields->inList($this->getColumns())
499+
fn (FieldCollection $fields) => $fields->inList($this->getColumns())
500500
)
501501
->forIndex($request, $this)
502-
->filter(fn(Field $field) => $field->authorize($request))
502+
->filter(fn (Field $field) => $field->authorize($request))
503503
->when(
504504
$this->eagerState,
505-
fn($items) => $items->filter(fn(Field $field) => ! $field instanceof EagerField)
505+
fn ($items) => $items->filter(fn (Field $field) => ! $field instanceof EagerField)
506506
)
507-
->each(fn(Field $field) => $field->resolveForIndex($this))
508-
->map(fn(Field $field) => $field->serializeToValue($request))
509-
->mapWithKeys(fn($value) => $value)
507+
->each(fn (Field $field) => $field->resolveForIndex($this))
508+
->map(fn (Field $field) => $field->serializeToValue($request))
509+
->mapWithKeys(fn ($value) => $value)
510510
->all();
511511
}
512512

@@ -540,10 +540,10 @@ public function resolveShowPivots(RestifyRequest $request): array
540540
}
541541

542542
return $pivots
543-
->filter(fn(Field $field) => $field->authorize($request))
544-
->each(fn(Field $field) => $field->resolve($this))
545-
->map(fn(Field $field) => $field->serializeToValue($request))
546-
->mapWithKeys(fn($value) => $value)
543+
->filter(fn (Field $field) => $field->authorize($request))
544+
->each(fn (Field $field) => $field->resolve($this))
545+
->map(fn (Field $field) => $field->serializeToValue($request))
546+
->mapWithKeys(fn ($value) => $value)
547547
->all();
548548
}
549549

@@ -569,8 +569,8 @@ public function resolveRelationships($request): array
569569
->forRequest($request, $this)
570570
->mapIntoRelated($request, $this)
571571
->unserialized($request, $this)
572-
->when($this->isForMcp(), fn(RelatedCollection $collection) => $collection->forMcp($request, $this))
573-
->map(fn(Related $related) => $related->resolve($request, $this)->getValue())
572+
->when($this->isForMcp(), fn (RelatedCollection $collection) => $collection->forMcp($request, $this))
573+
->map(fn (Related $related) => $related->resolve($request, $this)->getValue())
574574
->map(function (mixed $items) {
575575
if ($items instanceof Collection) {
576576
return $items->filter()->values();
@@ -636,13 +636,13 @@ public function indexAsArray(RestifyRequest $request): array
636636
return $repository->authorizedToShow($request);
637637
})->values();
638638

639-
$data = $items->map(fn(self $repository) => $repository->serializeForIndex($request));
639+
$data = $items->map(fn (self $repository) => $repository->serializeForIndex($request));
640640

641641
return $this->filter([
642642
'meta' => $this->when(
643643
$meta = $this->resolveIndexMainMeta(
644644
$request,
645-
$models = $items->map(fn(self $repository) => $repository->resource),
645+
$models = $items->map(fn (self $repository) => $repository->resource),
646646
[
647647
'current_page' => $paginator->currentPage(),
648648
'from' => $paginator->firstItem(),
@@ -728,14 +728,14 @@ public function store(RestifyRequest $request)
728728
}
729729
}
730730

731-
$fields->each(fn(Field $field) => $field->invokeAfter($request, $this->resource));
731+
$fields->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));
732732

733733
$this
734734
->collectFields($request)
735735
->forStore($request, $this)
736736
->withActions($request, $this)
737737
->authorizedStore($request)
738-
->each(fn(Field $field) => $field->actionHandler->handle($request, $this->resource));
738+
->each(fn (Field $field) => $field->actionHandler->handle($request, $this->resource));
739739
});
740740

741741
if (method_exists(static::class, 'stored')) {
@@ -764,14 +764,14 @@ public function storeBulk(RepositoryStoreBulkRequest $request)
764764

765765
$this->resource->save();
766766

767-
$fields->each(fn(Field $field) => $field->invokeAfter($request, $this->resource));
767+
$fields->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));
768768

769769
$this
770770
->collectFields($request)
771771
->forStoreBulk($request, $this)
772772
->withActions($request, $this, $row)
773773
->authorizedUpdateBulk($request)
774-
->each(fn(Field $field) => $field->actionHandler->handle($request, $this->resource, $row));
774+
->each(fn (Field $field) => $field->actionHandler->handle($request, $this->resource, $row));
775775

776776
return $this->resource;
777777
});
@@ -798,15 +798,15 @@ public function update(RestifyRequest $request, $repositoryId)
798798

799799
return $fields;
800800
})->each(
801-
fn(Field $field) => $field->invokeAfter($request, $this->resource)
801+
fn (Field $field) => $field->invokeAfter($request, $this->resource)
802802
);
803803

804804
$this
805805
->collectFields($request)
806806
->forUpdate($request, $this)
807807
->withActions($request, $this)
808808
->authorizedUpdate($request)
809-
->each(fn(Field $field) => $field->actionHandler->handle($request, $this->resource));
809+
->each(fn (Field $field) => $field->actionHandler->handle($request, $this->resource));
810810

811811
return data($this->serializeForShow($request));
812812
}
@@ -818,7 +818,7 @@ public function patch(RestifyRequest $request, $repositoryId)
818818
DB::transaction(function () use ($request, $keys) {
819819
$fields = $this->collectFields($request)
820820
->filter(
821-
fn(Field $field) => in_array($field->attribute, $keys),
821+
fn (Field $field) => in_array($field->attribute, $keys),
822822
)
823823
->forUpdate($request, $this)
824824
->withoutActions($request, $this)
@@ -837,18 +837,18 @@ public function patch(RestifyRequest $request, $repositoryId)
837837

838838
return $fields;
839839
})->each(
840-
fn(Field $field) => $field->invokeAfter($request, $this->resource)
840+
fn (Field $field) => $field->invokeAfter($request, $this->resource)
841841
);
842842

843843
$this
844844
->collectFields($request)
845845
->filter(
846-
fn(Field $field) => in_array($field->attribute, $keys),
846+
fn (Field $field) => in_array($field->attribute, $keys),
847847
)
848848
->forUpdate($request, $this)
849849
->withActions($request, $this)
850850
->authorizedPatch($request)
851-
->each(fn(Field $field) => $field->actionHandler->handle($request, $this->resource));
851+
->each(fn (Field $field) => $field->actionHandler->handle($request, $this->resource));
852852

853853
return data($this->serializeForShow($request));
854854
}
@@ -869,7 +869,7 @@ public function updateBulk(RestifyRequest $request, $repositoryId, int $row)
869869
->forUpdateBulk($request, $this)
870870
->withActions($request, $this, $row)
871871
->authorizedUpdateBulk($request)
872-
->each(fn(Field $field) => $field->actionHandler->handle($request, $this->resource, $row));
872+
->each(fn (Field $field) => $field->actionHandler->handle($request, $this->resource, $row));
873873

874874
return response()->json();
875875
}
@@ -894,7 +894,7 @@ public function attach(RestifyRequest $request, $repositoryId, Collection $pivot
894894
$eagerField = $this->authorizeBelongsToMany($request)->belongsToManyField($request);
895895

896896
DB::transaction(function () use ($request, $pivots, $eagerField) {
897-
$fields = $eagerField->collectPivotFields()->filter(fn(
897+
$fields = $eagerField->collectPivotFields()->filter(fn (
898898
$pivotField
899899
) => $request->has($pivotField->attribute))->values();
900900

@@ -938,7 +938,7 @@ public function detach(RestifyRequest $request, $repositoryId, Collection $pivot
938938

939939
$deleted = DB::transaction(function () use ($pivots, $eagerField, $request) {
940940
return $pivots
941-
->map(fn($pivot) => $eagerField->authorizeToDetach($request, $pivot) && $pivot->delete());
941+
->map(fn ($pivot) => $eagerField->authorizeToDetach($request, $pivot) && $pivot->delete());
942942
});
943943

944944
return data($deleted, 204);
@@ -981,7 +981,7 @@ public function allowToAttach(RestifyRequest $request, Collection $attachers): s
981981
{
982982
$methodGuesser = 'attach'.Str::studly($request->relatedRepository);
983983

984-
$attachers->each(fn($model) => $this->authorizeToAttach($request, $methodGuesser, $model));
984+
$attachers->each(fn ($model) => $this->authorizeToAttach($request, $methodGuesser, $model));
985985

986986
return $this;
987987
}
@@ -999,7 +999,7 @@ public function allowToDetach(RestifyRequest $request, Collection $attachers): s
999999
{
10001000
$methodGuesser = 'detach'.Str::studly($request->relatedRepository);
10011001

1002-
$attachers->each(fn($model) => $this->authorizeToDetach($request, $methodGuesser, $model));
1002+
$attachers->each(fn ($model) => $this->authorizeToDetach($request, $methodGuesser, $model));
10031003

10041004
return $this;
10051005
}
@@ -1103,7 +1103,7 @@ public function serializeForShow(RestifyRequest $request): array
11031103
$this->request = $request;
11041104

11051105
return $this->filter([
1106-
'id' => $this->when(optional($this->resource)?->getKey(), fn() => $this->getId($request)),
1106+
'id' => $this->when(optional($this->resource)?->getKey(), fn () => $this->getId($request)),
11071107
'type' => $this->when($type = $this->getType($request), $type),
11081108
'attributes' => $request->isShowRequest() ? $this->resolveShowAttributes($request) : $this->resolveIndexAttributes($request),
11091109
'relationships' => $this->when(value($related = $this->resolveRelationships($request)), $related),
@@ -1171,7 +1171,7 @@ private function modelAttributes(?Request $request = null): Collection
11711171
*/
11721172
protected static function fillFields(RestifyRequest $request, Model $model, Collection $fields)
11731173
{
1174-
return $fields->map(fn(Field $field) => $field->fillAttribute($request, $model));
1174+
return $fields->map(fn (Field $field) => $field->fillAttribute($request, $model));
11751175
}
11761176

11771177
protected static function fillBulkFields(
@@ -1239,14 +1239,14 @@ public function restifyjsSerialize(RestifyRequest $request): array
12391239
'match' => static::collectFilters('matches'),
12401240
'searchables' => static::collectFilters('searchables'),
12411241
'actions' => $this->resolveActions($request)
1242-
->filter(fn(mixed $action) => $action instanceof Action)
1243-
->filter(fn(Action $action) => $action->isShownOnIndex(
1242+
->filter(fn (mixed $action) => $action instanceof Action)
1243+
->filter(fn (Action $action) => $action->isShownOnIndex(
12441244
$request,
12451245
$this
12461246
))->values(),
12471247
'getters' => $this->resolveGetters($request)
1248-
->filter(fn(mixed $action) => $action instanceof Getter)
1249-
->filter(fn(Getter $action) => $action->isShownOnIndex(
1248+
->filter(fn (mixed $action) => $action instanceof Getter)
1249+
->filter(fn (Getter $action) => $action->isShownOnIndex(
12501250
$request,
12511251
$this
12521252
))->values(),

‎src/Services/Search/RepositorySearchService.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public function search(RestifyRequest $request, Repository $repository): Builder
3636
$shouldUseScout
3737
? $this->prepareRelations($request, $scoutQuery ?? $repository::query($request))
3838
: $this->prepareSearchFields(
39-
$request,
40-
$this->prepareRelations($request, $scoutQuery ?? $repository::query($request)),
41-
),
39+
$request,
40+
$this->prepareRelations($request, $scoutQuery ?? $repository::query($request)),
41+
),
4242
);
4343

4444
$query = $this->applyFilters($request, $repository, $query);
@@ -86,7 +86,7 @@ public function prepareRelations(RestifyRequest $request, Builder|Relation $quer
8686
$eager = ($this->repository)::collectRelated()
8787
->forRequest($request, $this->repository)
8888
->map(
89-
fn($relation) => $relation instanceof EagerField
89+
fn ($relation) => $relation instanceof EagerField
9090
? $relation->relation
9191
: $relation
9292
)
@@ -98,8 +98,8 @@ public function prepareRelations(RestifyRequest $request, Builder|Relation $quer
9898
return $query;
9999
}
100100

101-
$filtered = collect($request->related()->makeTree())->filter(fn(string $relationships) => in_array(
102-
str($relationships)->whenContains('.', fn(Stringable $string) => $string->before('.'))->toString(),
101+
$filtered = collect($request->related()->makeTree())->filter(fn (string $relationships) => in_array(
102+
str($relationships)->whenContains('.', fn (Stringable $string) => $string->before('.'))->toString(),
103103
$eager,
104104
true,
105105
))->filter(function ($relation) use ($query) {
@@ -158,14 +158,14 @@ public function prepareSearchFields(RestifyRequest $request, $query)
158158
protected function applyIndexQuery(RestifyRequest $request, Repository $repository)
159159
{
160160
if ($request->isIndexRequest() || $request->isGlobalRequest()) {
161-
return fn($query) => $repository::indexQuery($request, $query);
161+
return fn ($query) => $repository::indexQuery($request, $query);
162162
}
163163

164164
if ($request->isShowRequest()) {
165-
return fn($query) => $repository::showQuery($request, $query);
165+
return fn ($query) => $repository::showQuery($request, $query);
166166
}
167167

168-
return fn($query) => $query;
168+
return fn ($query) => $query;
169169
}
170170

171171
public function initializeQueryUsingScout(RestifyRequest $request, Repository $repository): Builder
@@ -193,7 +193,7 @@ function ($scoutBuilder) use ($repository, $request) {
193193

194194
protected function applyMainQuery(RestifyRequest $request, Repository $repository): callable
195195
{
196-
return fn($query) => $repository::mainQuery($request, $query->with($repository::collectWiths(
196+
return fn ($query) => $repository::mainQuery($request, $query->with($repository::collectWiths(
197197
$request, $repository
198198
)->all()));
199199
}

0 commit comments

Comments
 (0)