Skip to content

Commit

Permalink
fix most of eclint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
xHeaven committed Jan 31, 2025
1 parent 9d73788 commit e550867
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 30 deletions.
25 changes: 14 additions & 11 deletions src/Fields/BelongsToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,17 @@ public function fields(Request $request): array
$model->getRelatedKey(),
$model->getForeignKey(),
'related'
)->withDefault())->withRelatableQuery(fn (Request $request, Builder $query, Pivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
$query->getModel()->getQualifiedKeyName(),
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
)))->hydrate(function (Request $request, Pivot $model, mixed $value): void {
$model->setAttribute(
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
$value
);
})->display(fn (Model $model): ?string => $this->resolveDisplay($model)),
)->withDefault())
->withRelatableQuery(fn (Request $request, Builder $query, Pivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
$query->getModel()->getQualifiedKeyName(),
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
)))->hydrate(function (Request $request, Pivot $model, mixed $value): void {
$model->setAttribute(
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
$value
);
})->display(fn (Model $model): ?string => $this->resolveDisplay($model)),
];
}

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

if ($field instanceof Relation) {
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value());
$field->resolveRouteKeyNameUsing(
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value()
);
}

parent::resolveField($request, $field);
Expand Down
4 changes: 3 additions & 1 deletion src/Fields/Fieldset.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ protected function resolveField(Request $request, Field $field): void
$field->resolveErrorsUsing($this->errorsResolver);

if ($field instanceof Relation) {
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value());
$field->resolveRouteKeyNameUsing(
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value()
);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Fields/MorphTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ public function routes(Router $router): void
public function toArray(): array
{
return array_merge(parent::toArray(), [
'types' => array_map(static fn (string $type): string => __(Str::of($type)->classBasename()->headline()->value()), array_combine($this->types, $this->types)),
'types' => array_map(
static fn (string $type): string => __(Str::of($type)->classBasename()->headline()->value()), array_combine($this->types, $this->types)
),
]);
}

Expand Down
13 changes: 8 additions & 5 deletions src/Fields/MorphToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ public function fields(Request $request): array
$model->getMorphType(),
$model->getRelatedKey(),
$model->getForeignKey(),
)->withDefault())->withRelatableQuery(fn (Request $request, Builder $query, MorphPivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
$query->getModel()->getQualifiedKeyName(),
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
)))->hydrate(function (Request $request, MorphPivot $model, mixed $value): void {
)->withDefault())
->withRelatableQuery(
fn (Request $request, Builder $query, MorphPivot $model): Builder => $this->resolveRelatableQuery($request, $model->pivotParent)
->unless($this->allowDuplicateRelations, fn (Builder $query): Builder => $query->whereNotIn(
$query->getModel()->getQualifiedKeyName(),
$this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
)))
->hydrate(function (Request $request, MorphPivot $model, mixed $value): void {
$model->setAttribute(
$this->getRelation($model->pivotParent)->getRelatedPivotKeyName(),
$value
Expand Down
16 changes: 11 additions & 5 deletions src/Fields/Relation.php
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,9 @@ protected function resolveField(Request $request, Field $field): void
}

if ($field instanceof Relation) {
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value());
$field->resolveRouteKeyNameUsing(
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getRouteKeyName())->value()
);
}
}

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

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

/**
Expand Down Expand Up @@ -752,11 +755,14 @@ public function getRouteMiddleware(): array
*/
protected function routesRegistered(Request $request): void
{
$uri = $this->getUri();
$routeKeyName = $this->getRouteKeyName();

Root::instance()->breadcrumbs->patterns([
$this->getUri() => $this->label,
sprintf('%s/create', $this->getUri()) => __('Add'),
sprintf('%s/{%s}', $this->getUri(), $this->getRouteKeyName()) => fn (Request $request): string => $this->resolveDisplay($request->route($this->getRouteKeyName())),
sprintf('%s/{%s}/edit', $this->getUri(), $this->getRouteKeyName()) => __('Edit'),
sprintf('%s/create', $uri) => __('Add'),
sprintf('%s/{%s}', $uri, $routeKeyName) => fn (Request $request): string => $this->resolveDisplay($request->route($routeKeyName)),
sprintf('%s/{%s}/edit', $uri, $routeKeyName) => __('Edit'),
]);
}

Expand Down
4 changes: 3 additions & 1 deletion src/Fields/Repeater.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ protected function resolveField(Request $request, Field $field): void
);

if ($field instanceof Relation) {
$field->resolveRouteKeyNameUsing(fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value());
$field->resolveRouteKeyNameUsing(
fn (): string => Str::of($field->getRelationName())->singular()->ucfirst()->prepend($this->getModelAttribute())->value()
);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Fields/Slug.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ public function unique(bool $value = true): static
$this->unique = $value;

if ($value) {
$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)]);
$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)]);
}

return $this;
Expand Down
12 changes: 7 additions & 5 deletions src/Root.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@ public function boot(): void
call_user_func_array($callback, [$this]);
}

$path = $this->getPath();

$this->breadcrumbs->patterns([
$this->getPath() => __('Dashboard'),
sprintf('%s/resources/{resource}', $this->getPath()) => static fn (Request $request): string => $request->route('_resource')->getName(),
sprintf('%s/resources/{resource}/create', $this->getPath()) => __('Create'),
sprintf('%s/resources/{resource}/{resourceModel}', $this->getPath()) => static fn (Request $request): string => $request->route('_resource')->modelTitle($request->route('resourceModel')),
sprintf('%s/resources/{resource}/{resourceModel}/edit', $this->getPath()) => __('Edit'),
$path => __('Dashboard'),
sprintf('%s/resources/{resource}', $path) => static fn (Request $request): string => $request->route('_resource')->getName(),
sprintf('%s/resources/{resource}/create', $path) => __('Create'),
sprintf('%s/resources/{resource}/{resourceModel}', $path) => static fn (Request $request): string => $request->route('_resource')->modelTitle($request->route('resourceModel')),
sprintf('%s/resources/{resource}/{resourceModel}/edit', $path) => __('Edit'),
]);
}

Expand Down

0 comments on commit e550867

Please sign in to comment.