Skip to content

Commit e550867

Browse files
xHeavenxHeaven
committed
fix most of eclint issues
1 parent 9d73788 commit e550867

File tree

8 files changed

+52
-30
lines changed

8 files changed

+52
-30
lines changed

‎src/Fields/BelongsToMany.php‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,17 @@ public function fields(Request $request): array
7272
$model->getRelatedKey(),
7373
$model->getForeignKey(),
7474
'related'
75-
)->withDefault())->withRelatableQuery(fn (Request $request, Builder $query, Pivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
76-
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
77-
$query->getModel()->getQualifiedKeyName(),
78-
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
79-
)))->hydrate(function (Request $request, Pivot $model, mixed $value): void {
80-
$model->setAttribute(
81-
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
82-
$value
83-
);
84-
})->display(fn (Model $model): ?string => $this->resolveDisplay($model)),
75+
)->withDefault())
76+
->withRelatableQuery(fn (Request $request, Builder $query, Pivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
77+
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
78+
$query->getModel()->getQualifiedKeyName(),
79+
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
80+
)))->hydrate(function (Request $request, Pivot $model, mixed $value): void {
81+
$model->setAttribute(
82+
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
83+
$value
84+
);
85+
})->display(fn (Model $model): ?string => $this->resolveDisplay($model)),
8586
];
8687
}
8788

@@ -107,7 +108,9 @@ protected function resolveField(Request $request, Field $field): void
107108
}
108109

109110
if ($field instanceof Relation) {
110-
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value());
111+
$field->resolveRouteKeyNameUsing(
112+
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value()
113+
);
111114
}
112115

113116
parent::resolveField($request, $field);

‎src/Fields/Fieldset.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ protected function resolveField(Request $request, Field $field): void
4747
$field->resolveErrorsUsing($this->errorsResolver);
4848

4949
if ($field instanceof Relation) {
50-
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value());
50+
$field->resolveRouteKeyNameUsing(
51+
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value()
52+
);
5153
}
5254
}
5355

‎src/Fields/MorphTo.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ public function routes(Router $router): void
9898
public function toArray(): array
9999
{
100100
return array_merge(parent::toArray(), [
101-
'types' => array_map(static fn (string $type): string => __(Str::of($type)->classBasename()->headline()->value()), array_combine($this->types, $this->types)),
101+
'types' => array_map(
102+
static fn (string $type): string => __(Str::of($type)->classBasename()->headline()->value()), array_combine($this->types, $this->types)
103+
),
102104
]);
103105
}
104106

‎src/Fields/MorphToMany.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ public function fields(Request $request): array
3333
$model->getMorphType(),
3434
$model->getRelatedKey(),
3535
$model->getForeignKey(),
36-
)->withDefault())->withRelatableQuery(fn (Request $request, Builder $query, MorphPivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
37-
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
38-
$query->getModel()->getQualifiedKeyName(),
39-
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
40-
)))->hydrate(function (Request $request, MorphPivot $model, mixed $value): void {
36+
)->withDefault())
37+
->withRelatableQuery(
38+
fn (Request $request, Builder $query, MorphPivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
39+
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
40+
$query->getModel()->getQualifiedKeyName(),
41+
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
42+
)))
43+
->hydrate(function (Request $request, MorphPivot $model, mixed $value): void {
4144
$model->setAttribute(
4245
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
4346
$value

‎src/Fields/Relation.php‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ protected function resolveField(Request $request, Field $field): void
437437
}
438438

439439
if ($field instanceof Relation) {
440-
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value());
440+
$field->resolveRouteKeyNameUsing(
441+
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value()
442+
);
441443
}
442444
}
443445

@@ -486,7 +488,8 @@ public function resolveRelatableQuery(Request $request, Model $model): Builder
486488
$query = call_user_func_array($scope, [$request, $query, $model]);
487489
}
488490

489-
return $query->when(! is_null($this->queryResolver), fn (Builder $query): Builder => call_user_func_array($this->queryResolver, [$request, $query, $model]));
491+
return $query
492+
->when(! is_null($this->queryResolver), fn (Builder $query): Builder => call_user_func_array($this->queryResolver, [$request, $query, $model]));
490493
}
491494

492495
/**
@@ -752,11 +755,14 @@ public function getRouteMiddleware(): array
752755
*/
753756
protected function routesRegistered(Request $request): void
754757
{
758+
$uri = $this->getUri();
759+
$routeKeyName = $this->getRouteKeyName();
760+
755761
Root::instance()->breadcrumbs->patterns([
756762
$this->getUri() => $this->label,
757-
sprintf('%s/create', $this->getUri()) => __('Add'),
758-
sprintf('%s/{%s}', $this->getUri(), $this->getRouteKeyName()) => fn (Request $request): string => $this->resolveDisplay($request->route($this->getRouteKeyName())),
759-
sprintf('%s/{%s}/edit', $this->getUri(), $this->getRouteKeyName()) => __('Edit'),
763+
sprintf('%s/create', $uri) => __('Add'),
764+
sprintf('%s/{%s}', $uri, $routeKeyName) => fn (Request $request): string => $this->resolveDisplay($request->route($routeKeyName)),
765+
sprintf('%s/{%s}/edit', $uri, $routeKeyName) => __('Edit'),
760766
]);
761767
}
762768

‎src/Fields/Repeater.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ protected function resolveField(Request $request, Field $field): void
114114
);
115115

116116
if ($field instanceof Relation) {
117-
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value());
117+
$field->resolveRouteKeyNameUsing(
118+
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value()
119+
);
118120
}
119121
}
120122

‎src/Fields/Slug.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ public function unique(bool $value = true): static
148148
$this->unique = $value;
149149

150150
if ($value) {
151-
$this->createRules(static fn (Request $request, Model $model): array => [Rule::unique($model->getTable())])->updateRules(static fn (Request $request, Model $model): array => [Rule::unique($model->getTable())->ignoreModel($model)]);
151+
$this->createRules(
152+
static fn (Request $request, Model $model): array => [Rule::unique($model->getTable())]
153+
)->updateRules(static fn (Request $request, Model $model): array => [Rule::unique($model->getTable())->ignoreModel($model)]);
152154
}
153155

154156
return $this;

‎src/Root.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,14 @@ public function boot(): void
111111
call_user_func_array($callback, [$this]);
112112
}
113113

114+
$path = $this->getPath();
115+
114116
$this->breadcrumbs->patterns([
115-
$this->getPath() => __('Dashboard'),
116-
sprintf('%s/resources/{resource}', $this->getPath()) => static fn (Request $request): string => $request->route('_resource')->getName(),
117-
sprintf('%s/resources/{resource}/create', $this->getPath()) => __('Create'),
118-
sprintf('%s/resources/{resource}/{resourceModel}', $this->getPath()) => static fn (Request $request): string => $request->route('_resource')->modelTitle($request->route('resourceModel')),
119-
sprintf('%s/resources/{resource}/{resourceModel}/edit', $this->getPath()) => __('Edit'),
117+
$path => __('Dashboard'),
118+
sprintf('%s/resources/{resource}', $path) => static fn (Request $request): string => $request->route('_resource')->getName(),
119+
sprintf('%s/resources/{resource}/create', $path) => __('Create'),
120+
sprintf('%s/resources/{resource}/{resourceModel}', $path) => static fn (Request $request): string => $request->route('_resource')->modelTitle($request->route('resourceModel')),
121+
sprintf('%s/resources/{resource}/{resourceModel}/edit', $path) => __('Edit'),
120122
]);
121123
}
122124

0 commit comments

Comments
 (0)