diff --git a/src/Actions/ActionEvent.php b/src/Actions/ActionEvent.php index 7afb7300f5bcbbdb21e8953edd122d8ed1deaa9b..64e004262a44006fc94625f2a396822233e15e85 100644 --- a/src/Actions/ActionEvent.php +++ b/src/Actions/ActionEvent.php @@ -69,12 +69,12 @@ class ActionEvent extends Model }; return $this->morphTo('target', 'target_type', 'target_id') - ->constrain( - collect(Nova::$resources) - ->filter(static fn ($resource) => $resource::softDeletes()) - ->mapWithKeys(static fn ($resource) => [$resource::$model => $queryWithTrashed]) - ->all() - )->when(true, static fn ($query) => $query->hasMacro('withTrashed') ? $queryWithTrashed($query) : $query); + ->constrain( + collect(Nova::$resources) + ->filter(static fn ($resource) => $resource::softDeletes()) + ->mapWithKeys(static fn ($resource) => [$resource::$model => $queryWithTrashed]) + ->all() + )->when(true, static fn ($query) => $query->hasMacro('withTrashed') ? $queryWithTrashed($query) : $query); } /** @@ -348,9 +348,9 @@ class ActionEvent extends Model ->whereNotIn('id', static function ($query) use ($model, $limit) { $query->select('id')->fromSub( static::select('id')->orderBy('id', 'desc') - ->where('actionable_id', $model['actionable_id']) - ->where('actionable_type', $model['actionable_type']) - ->limit($limit)->toBase(), + ->where('actionable_id', $model['actionable_id']) + ->where('actionable_type', $model['actionable_type']) + ->limit($limit)->toBase(), 'action_events_temp' ); })->delete(); @@ -363,7 +363,7 @@ class ActionEvent extends Model public static function markBatchAsRunning(string $batchId): int { return static::where('batch_id', $batchId) - ->whereNotIn('status', ['finished', 'failed'])->update([ + ->whereNotIn('status', ['finished', 'failed'])->update([ 'status' => 'running', ]); } @@ -374,7 +374,7 @@ class ActionEvent extends Model public static function markBatchAsFinished(string $batchId): int { return static::where('batch_id', $batchId) - ->whereNotIn('status', ['finished', 'failed'])->update([ + ->whereNotIn('status', ['finished', 'failed'])->update([ 'status' => 'finished', ]); } @@ -397,7 +397,7 @@ class ActionEvent extends Model public static function markBatchAsFailed(string $batchId, Throwable|string|null $e = null): int { return static::where('batch_id', $batchId) - ->whereNotIn('status', ['finished', 'failed'])->update([ + ->whereNotIn('status', ['finished', 'failed'])->update([ 'status' => 'failed', 'exception' => $e ? (string) $e : '', ]); @@ -421,9 +421,9 @@ class ActionEvent extends Model public static function updateStatus(string $batchId, $model, string $status, Throwable|string|null $e = null): int { return static::where('batch_id', $batchId) - ->where('model_type', $model->getMorphClass()) - ->where('model_id', $model->getKey()) - ->update(['status' => $status, 'exception' => (string) $e]); + ->where('model_type', $model->getMorphClass()) + ->where('model_id', $model->getKey()) + ->update(['status' => $status, 'exception' => (string) $e]); } /** diff --git a/src/Actions/CallQueuedAction.php b/src/Actions/CallQueuedAction.php index 2902a79fbdea7cd0aba233513e862e6d63dbda1e..362e97ee34015d0596892e2a4a3891d08eb99f22 100644 --- a/src/Actions/CallQueuedAction.php +++ b/src/Actions/CallQueuedAction.php @@ -56,7 +56,7 @@ class CallQueuedAction } return $action->withActionBatchId($this->actionBatchId) - ->{$this->method}($this->fields, $this->models); + ->{$this->method}($this->fields, $this->models); }); } diff --git a/src/Auth/Actions/LoginViewResponse.php b/src/Auth/Actions/LoginViewResponse.php index e3520394f11f10b8b8fc442de6a98e9d3fca14fd..14d958bc9646129ba1feb51c2b5163bb32d3efb0 100644 --- a/src/Auth/Actions/LoginViewResponse.php +++ b/src/Auth/Actions/LoginViewResponse.php @@ -19,6 +19,7 @@ class LoginViewResponse implements Responsable $initialYear = config('app.initialyear', date('Y')); $currentYear = date('Y'); $years = $initialYear <= $currentYear ? range($initialYear, $currentYear) : []; + return Inertia::render('Nova.Login', [ 'username' => Nova::fortify()->username, 'email' => Nova::fortify()->email, diff --git a/src/Auth/Actions/LogoutResponse.php b/src/Auth/Actions/LogoutResponse.php index f316630eab289a83970342aac7ac3bd5749a58b4..a5abf7aca961e7bd45ed437e6ba6064c92c65bde 100644 --- a/src/Auth/Actions/LogoutResponse.php +++ b/src/Auth/Actions/LogoutResponse.php @@ -4,7 +4,6 @@ namespace Laravel\Nova\Auth\Actions; use Illuminate\Http\JsonResponse; use Laravel\Fortify\Contracts\LogoutResponse as Responsable; -use Laravel\Nova\Nova; class LogoutResponse implements Responsable { diff --git a/src/Concerns/HandlesRoutes.php b/src/Concerns/HandlesRoutes.php index 468f44e7e6156ec7d7a2db805c90530e2df3853a..8f520a03549248b5d81b58ad4335160c1a5b1d45 100644 --- a/src/Concerns/HandlesRoutes.php +++ b/src/Concerns/HandlesRoutes.php @@ -46,8 +46,8 @@ trait HandlesRoutes public static function router(?array $middleware = null, ?string $prefix = null): RouteRegistrar { return Route::domain(config('nova.domain', null)) - ->prefix(static::url($prefix)) - ->middleware($middleware ?? config('nova.middleware', [])); + ->prefix(static::url($prefix)) + ->middleware($middleware ?? config('nova.middleware', [])); } /** diff --git a/src/Fields/DetachesPivotModels.php b/src/Fields/DetachesPivotModels.php index 32bd7a4d86d3c9454ad3c58af66ca9c5dbd548c9..436b182efbf202ddd0aa996b25965f247f61e5de 100644 --- a/src/Fields/DetachesPivotModels.php +++ b/src/Fields/DetachesPivotModels.php @@ -26,11 +26,11 @@ trait DetachesPivotModels $pivotFields = $resource->resolvePivotFields($request, $request->resource); $pivotFields->whereInstanceOf(Deletable::class) - ->filter->isPrunable() - ->each(static function ($field) use ($request, $pivot) { - /** @var \Laravel\Nova\Fields\Field&\Laravel\Nova\Contracts\Deletable $field */ - DeleteField::forRequest($request, $field, $pivot)->save(); - }); + ->filter->isPrunable() + ->each(static function ($field) use ($request, $pivot) { + /** @var \Laravel\Nova\Fields\Field&\Laravel\Nova\Contracts\Deletable $field */ + DeleteField::forRequest($request, $field, $pivot)->save(); + }); $pivot->delete(); } diff --git a/src/Fields/HasOne.php b/src/Fields/HasOne.php index f70620a382cebd6c544947d87e6d126e252a0f30..3805b5c68583d274b4e49af4dff2ea6692f4cd2c 100644 --- a/src/Fields/HasOne.php +++ b/src/Fields/HasOne.php @@ -121,16 +121,16 @@ class HasOne extends Field implements BehavesAsPanel, RelatableField if ($this->ofManyRelationship === false && $request->viaRelationship === $this->attribute && $request->viaResourceId) { $parent = $parentResource::newModel() - ->with($this->attribute) - ->find($request->viaResourceId); + ->with($this->attribute) + ->find($request->viaResourceId); return model_exists($parent->{$this->attribute}); } return false; })->showOnCreating(static fn ($request) => ! \in_array($request->relationshipType, ['hasOne', 'morphOne'])) - ->showOnUpdating(static fn ($request) => ! \in_array($request->relationshipType, ['hasOne', 'morphOne'])) - ->nullable(); + ->showOnUpdating(static fn ($request) => ! \in_array($request->relationshipType, ['hasOne', 'morphOne'])) + ->nullable(); } /** diff --git a/src/Fields/ID.php b/src/Fields/ID.php index fc61576f5fc3c3bf8c85f62cea2a675a6bfe83d2..b7cce350a136f29140f02def595968c6450b2c85 100644 --- a/src/Fields/ID.php +++ b/src/Fields/ID.php @@ -66,8 +66,8 @@ class ID extends Field /** @phpstan-ignore argument.templateType */ $field = transform( $resource->availableFieldsOnIndexOrDetail(app(NovaRequest::class)) - ->whereInstanceOf(self::class) - ->first(), + ->whereInstanceOf(self::class) + ->first(), static fn ($field) => tap($field)->resolve($model), static fn () => model_exists($model) ? static::forModel($model) : null, ); diff --git a/src/Fields/MorphTo.php b/src/Fields/MorphTo.php index 9ed7b84baaf432c189f5b3c23f981b76a3de4706..5e88368277ecea82913960277a02f753b93613aa 100644 --- a/src/Fields/MorphTo.php +++ b/src/Fields/MorphTo.php @@ -542,9 +542,9 @@ class MorphTo extends Field implements FilterableField, RelatableField protected function defaultFilterableCallback() { $morphToTypes = collect($this->morphToTypes) - ->pluck('type') - ->mapWithKeys(static fn ($type) => [$type => $type::newModel()->getMorphClass()]) - ->all(); + ->pluck('type') + ->mapWithKeys(static fn ($type) => [$type => $type::newModel()->getMorphClass()]) + ->all(); return function (NovaRequest $request, $query, $value, $attribute) use ($morphToTypes) { $query->whereHasMorph( diff --git a/src/Fields/MorphToMany.php b/src/Fields/MorphToMany.php index 6733e04ed936636ff82a17fa0d6318ff8fb9d2d5..e7de0b21516178843e2b451c945bc938e39c305a 100644 --- a/src/Fields/MorphToMany.php +++ b/src/Fields/MorphToMany.php @@ -229,9 +229,9 @@ class MorphToMany extends Field implements DeletableContract, ListableField, Piv public function asPanel(): Panel { return Panel::make($this->name, [$this]) - ->withMeta([ - 'prefixComponent' => true, - ])->withComponent('relationship-panel'); + ->withMeta([ + 'prefixComponent' => true, + ])->withComponent('relationship-panel'); } /** diff --git a/src/Fields/Number.php b/src/Fields/Number.php index 3a108d67497024db8d2907f16317dc7e7535e94f..81cf14b6b2ebd54fdf4884b4660964852abf435c 100644 --- a/src/Fields/Number.php +++ b/src/Fields/Number.php @@ -144,6 +144,6 @@ class Number extends Text 'max' => $this->max, 'step' => $this->step, ])->reject(static fn ($value) => \is_null($value) || (empty($value) && $value !== 0)) - ->all()); + ->all()); } } diff --git a/src/Fields/Select.php b/src/Fields/Select.php index 4ae05345d3c43984d8385dcaddd988d7517b4a62..f6e4dba4cb2f95cf298279021f6ba275366604d6 100644 --- a/src/Fields/Select.php +++ b/src/Fields/Select.php @@ -68,8 +68,8 @@ class Select extends Field implements FilterableField } return collect($this->serializeOptions(false)) - ->where('value', $value) - ->first()['label'] ?? $value; + ->where('value', $value) + ->first()['label'] ?? $value; }); return $this; diff --git a/src/Http/Controllers/AttachableController.php b/src/Http/Controllers/AttachableController.php index 4cf630635200e012db9737e0b5a2efa88508a2d7..8566e245274befe161c9bc6f098a944698a99251 100644 --- a/src/Http/Controllers/AttachableController.php +++ b/src/Http/Controllers/AttachableController.php @@ -16,13 +16,13 @@ class AttachableController extends Controller public function __invoke(NovaRequest $request): array { $field = $request->newResource() - ->availableFieldsOnIndexOrDetail($request) - ->filterForManyToManyRelations() - ->filter(static function ($field) use ($request) { - return $field->resourceName === $request->field && // @phpstan-ignore property.notFound - $field->component === $request->component && - $field->attribute === $request->viaRelationship; - })->first(); + ->availableFieldsOnIndexOrDetail($request) + ->filterForManyToManyRelations() + ->filter(static function ($field) use ($request) { + return $field->resourceName === $request->field && // @phpstan-ignore property.notFound + $field->component === $request->component && + $field->attribute === $request->viaRelationship; + })->first(); abort_if(\is_null($field), 404); @@ -94,8 +94,8 @@ class AttachableController extends Controller $relation = $relatedModel->{$field->manyToManyRelationship}(); return $relation->applyDefaultPivotQuery($query) - ->select($relation->getRelatedPivotKeyName()) - ->whereColumn($relation->getQualifiedRelatedKeyName(), $relation->getQualifiedRelatedPivotKeyName()); + ->select($relation->getRelatedPivotKeyName()) + ->whereColumn($relation->getQualifiedRelatedKeyName(), $relation->getQualifiedRelatedPivotKeyName()); }); }; } diff --git a/src/Http/Controllers/CreationPivotFieldController.php b/src/Http/Controllers/CreationPivotFieldController.php index fb42077eb9b4b02e204b5c70794b53ca8edb3bce..b7ded459106dc4904128ded4bdfee34c8f46fd99 100644 --- a/src/Http/Controllers/CreationPivotFieldController.php +++ b/src/Http/Controllers/CreationPivotFieldController.php @@ -31,7 +31,7 @@ class CreationPivotFieldController extends Controller return $request->query('field') === $field->attribute && $request->query('component') === $field->dependentComponentKey(); })->applyDependsOn($request) - ->first() + ->first() ); } } diff --git a/src/Http/Controllers/UpdatePivotFieldController.php b/src/Http/Controllers/UpdatePivotFieldController.php index b0f7ac6911c25c54363552dc413235301890f991..ba89859be82dc825d7bb5ddbff844ab02de7ba3c 100644 --- a/src/Http/Controllers/UpdatePivotFieldController.php +++ b/src/Http/Controllers/UpdatePivotFieldController.php @@ -31,7 +31,7 @@ class UpdatePivotFieldController extends Controller return $request->query('field') === $field->attribute && $request->query('component') === $field->dependentComponentKey(); })->applyDependsOn($request) - ->first() + ->first() ); } } diff --git a/src/Http/Middleware/HandleInertiaRequests.php b/src/Http/Middleware/HandleInertiaRequests.php index a7da596238c5d05d549e0de25aecdadd99c6e362..9ebf752e6cb817c4d9f67f646083309a7f69be2a 100644 --- a/src/Http/Middleware/HandleInertiaRequests.php +++ b/src/Http/Middleware/HandleInertiaRequests.php @@ -4,7 +4,6 @@ namespace Laravel\Nova\Http\Middleware; use Closure; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Config; use Inertia\Inertia; use Inertia\Middleware; diff --git a/src/Http/Requests/LensRequest.php b/src/Http/Requests/LensRequest.php index 8a55639879bbc5118fadcf6c8baeb73c5abc2187..83ec987766cbacfcb2979c3cd569c7d7158cc2dc 100644 --- a/src/Http/Requests/LensRequest.php +++ b/src/Http/Requests/LensRequest.php @@ -116,9 +116,9 @@ class LensRequest extends NovaRequest $payload['actions'] = collect( $hasId === true ? array_values($lensResource->actions($this)) : [] )->filter(static fn ($action) => $action->shownOnIndex() || $action->shownOnTableRow()) - ->filter->authorizedToSee($this) - ->filter->authorizedToRun($this, $model) - ->values(); + ->filter->authorizedToSee($this) + ->filter->authorizedToRun($this, $model) + ->values(); return $payload; }); diff --git a/src/Jobs/DeletesFields.php b/src/Jobs/DeletesFields.php index 31c7ebc13b8632dafcf85586b423dfef430e3f3d..9d83d7483513e417f8c74248f3b8e131123ffd19 100644 --- a/src/Jobs/DeletesFields.php +++ b/src/Jobs/DeletesFields.php @@ -29,10 +29,10 @@ trait DeletesFields } $request->newResourceWith($model) - ->deletableFields($request) - ->filter->isPrunable() - ->each(static function ($field) use ($request, $model) { - DeleteField::forRequest($request, $field, $model); - }); + ->deletableFields($request) + ->filter->isPrunable() + ->each(static function ($field) use ($request, $model) { + DeleteField::forRequest($request, $field, $model); + }); } } diff --git a/src/Menu/Breadcrumb.php b/src/Menu/Breadcrumb.php index 8c53b2f26e2cd4761f8c79400c7fde38a8c72d53..385dd5162fb82cea31d5e8ab5c849248f054adbe 100644 --- a/src/Menu/Breadcrumb.php +++ b/src/Menu/Breadcrumb.php @@ -44,13 +44,13 @@ class Breadcrumb implements JsonSerializable 'title' => $resourceClass->title(), ]) )->path('/resources/'.$resourceClass::uriKey().'/'.$resourceClass->getKey()) - ->canSee(static fn ($request) => $resourceClass->authorizedToView($request)); + ->canSee(static fn ($request) => $resourceClass->authorizedToView($request)); } return static::make( Nova::__($resourceClass::label()) )->path('/resources/'.$resourceClass::uriKey()) - ->canSee(static fn ($request) => $resourceClass::availableForNavigation($request) && $resourceClass::authorizedToViewAny($request)); + ->canSee(static fn ($request) => $resourceClass::availableForNavigation($request) && $resourceClass::authorizedToViewAny($request)); } /** diff --git a/src/Menu/Menu.php b/src/Menu/Menu.php index 2f5b7977d44ab7fca75ff1294c308e3bb79cc35b..d01a02aa4d31f14c918b2be3b25f6746b99d095e 100644 --- a/src/Menu/Menu.php +++ b/src/Menu/Menu.php @@ -99,8 +99,8 @@ class Menu implements JsonSerializable $request = app(NovaRequest::class); return $this->items->flatten() - ->reject(static fn ($item) => method_exists($item, 'authorizedToSee') && ! $item->authorizedToSee($request)) - ->values() - ->jsonSerialize(); + ->reject(static fn ($item) => method_exists($item, 'authorizedToSee') && ! $item->authorizedToSee($request)) + ->values() + ->jsonSerialize(); } } diff --git a/src/Menu/MenuSection.php b/src/Menu/MenuSection.php index a1251233a3b2eeb348254bb193271d2025c03e01..5a22711d04851bb03217e871e04bd6eb3ab7b064 100644 --- a/src/Menu/MenuSection.php +++ b/src/Menu/MenuSection.php @@ -82,7 +82,7 @@ class MenuSection implements JsonSerializable return static::make( $dashboard->label() )->path('/dashboards/'.$dashboard->uriKey()) - ->canSee(static fn ($request) => $dashboard->authorizedToSee($request)); + ->canSee(static fn ($request) => $dashboard->authorizedToSee($request)); }); } @@ -97,7 +97,7 @@ class MenuSection implements JsonSerializable return static::make( $resourceClass::label() )->path('/resources/'.$resourceClass::uriKey()) - ->canSee(static fn ($request) => $resourceClass::availableForNavigation($request) && $resourceClass::authorizedToViewAny($request)); + ->canSee(static fn ($request) => $resourceClass::availableForNavigation($request) && $resourceClass::authorizedToViewAny($request)); } /** diff --git a/src/Metrics/Table.php b/src/Metrics/Table.php index 8885a6fbdd43c95f6bda529df1f0c5338fadd30f..e960afcc5767f3600b41b1a7b1c657913bb4015f 100644 --- a/src/Metrics/Table.php +++ b/src/Metrics/Table.php @@ -47,6 +47,7 @@ class Table extends Metric return $this; } + /** * Prepare the metric for JSON serialization. * diff --git a/src/Metrics/Trend.php b/src/Metrics/Trend.php index 06ef73509f54c9a2819f5d5715593bb514fb6571..52b6cccf0c0eeff32221cbd608d107330c6e4fb5 100644 --- a/src/Metrics/Trend.php +++ b/src/Metrics/Trend.php @@ -392,12 +392,12 @@ abstract class Trend extends RangedMetric $wrappedColumn = $query->getQuery()->getGrammar()->wrap($column); $results = $query - ->select(DB::raw("{$expression} as date_result, {$function}({$wrappedColumn}) as aggregate")) - ->tap(fn ($query) => $this->applyFilterQuery($request, $query)) - ->whereBetween($dateColumn, $this->formatQueryDateBetween([$startingDate, $endingDate])) - ->groupBy(DB::raw($expression)) - ->orderBy('date_result') - ->get(); + ->select(DB::raw("{$expression} as date_result, {$function}({$wrappedColumn}) as aggregate")) + ->tap(fn ($query) => $this->applyFilterQuery($request, $query)) + ->whereBetween($dateColumn, $this->formatQueryDateBetween([$startingDate, $endingDate])) + ->groupBy(DB::raw($expression)) + ->orderBy('date_result') + ->get(); $possibleDateKeys = array_keys($possibleDateResults); @@ -410,7 +410,7 @@ abstract class Trend extends RangedMetric $request->twelveHourTime === 'true' ) => round($result->aggregate ?? 0, $this->roundingPrecision, $this->roundingMode), ])->reject(static fn ($value, $key) => ! \in_array($key, $possibleDateKeys)) - ->all() + ->all() ); return $this->result(Arr::last($results))->trend( diff --git a/src/Nova.php b/src/Nova.php index 481fa80ceab75cce2c450f15034402daf03b2a84..bacf8f8bc1dad53eb04a3e5fcf7cd531c7d453a3 100644 --- a/src/Nova.php +++ b/src/Nova.php @@ -8,16 +8,13 @@ use Carbon\CarbonInterval; use Closure; use Illuminate\Console\Command; use Illuminate\Contracts\Auth\Access\Gate as GateContract; -use Illuminate\Http\Client\Response as ClientResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Blade; -use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Http; use Illuminate\Support\Str; use Illuminate\Validation\Rules\Password; use Laravel\Nova\Actions\ActionResource; diff --git a/src/PerformsQueries.php b/src/PerformsQueries.php index 2223bf38f0feea4225b4820fbb85396e647894d4..a3f8b3da4779ed70b2620f1242d2d1d0764bbeb6 100644 --- a/src/PerformsQueries.php +++ b/src/PerformsQueries.php @@ -57,13 +57,13 @@ trait PerformsQueries /** @phpstan-ignore nullCoalesce.expr */ $searchColumns = collect(static::searchableColumns() ?? []) - ->transform(static function ($column) use ($modelKeyName) { - if ($column === $modelKeyName) { - return new PrimaryKey($column, static::maxPrimaryKeySize()); - } + ->transform(static function ($column) use ($modelKeyName) { + if ($column === $modelKeyName) { + return new PrimaryKey($column, static::maxPrimaryKeySize()); + } - return $column; - })->all(); + return $column; + })->all(); return static::initializeSearch($query, $search, $searchColumns); } diff --git a/src/ResolvesActions.php b/src/ResolvesActions.php index ffd82682f9cb1e99b1d65a1c434aa5171c95b541..4d3664f9b996f1aa6f51f92461a54bef523db247 100644 --- a/src/ResolvesActions.php +++ b/src/ResolvesActions.php @@ -27,7 +27,7 @@ trait ResolvesActions } $actions = $this->resolveActions($request) - ->filter->authorizedToSee($request); + ->filter->authorizedToSee($request); if (model_exists($resource)) { return $actions->withAuthorizedToRun($request, $resource)->values(); @@ -54,7 +54,7 @@ trait ResolvesActions $resource = $this->resource; $actions = $this->resolveActions($request) - ->authorizedToSeeOnIndex($request); + ->authorizedToSeeOnIndex($request); if (model_exists($resource)) { return $actions->withAuthorizedToRun($request, $resource) @@ -85,12 +85,12 @@ trait ResolvesActions public function availableActionsOnDetail(NovaRequest $request): ActionCollection { return $this->resolveActions($request) - ->authorizedToSeeOnDetail($request) - ->withAuthorizedToRun($request, $this->resource) - ->each(function ($action) { - $action->resource = $this->resource; - }) - ->values(); + ->authorizedToSeeOnDetail($request) + ->withAuthorizedToRun($request, $this->resource) + ->each(function ($action) { + $action->resource = $this->resource; + }) + ->values(); } /** @@ -101,12 +101,12 @@ trait ResolvesActions public function availableActionsOnTableRow(NovaRequest $request): ActionCollection { return $this->resolveActions($request) - ->authorizedToSeeOnTableRow($request) - ->withAuthorizedToRun($request, $this->resource) - ->each(function ($action) { - $action->resource = $this->resource; - }) - ->values(); + ->authorizedToSeeOnTableRow($request) + ->withAuthorizedToRun($request, $this->resource) + ->each(function ($action) { + $action->resource = $this->resource; + }) + ->values(); } /** @@ -129,8 +129,8 @@ trait ResolvesActions public function availablePivotActions(NovaRequest $request): ActionCollection { return $this->resolvePivotActions($request) - ->authorizedToSeeOnIndex($request) - ->values(); + ->authorizedToSeeOnIndex($request) + ->values(); } /** diff --git a/src/ResolvesFilters.php b/src/ResolvesFilters.php index 91f007a7203199f436f3ccef8f15284f1dd5328c..e4fdf9267b4372b81272d71d7305c4b5482337e3 100644 --- a/src/ResolvesFilters.php +++ b/src/ResolvesFilters.php @@ -15,9 +15,9 @@ trait ResolvesFilters public function availableFilters(NovaRequest $request): Collection { return $this->resolveFilters($request) - ->concat($this->resolveFiltersFromFields($request)) - ->filter->authorizedToSee($request) - ->values(); + ->concat($this->resolveFiltersFromFields($request)) + ->filter->authorizedToSee($request) + ->values(); } /** diff --git a/src/Rules/NotExactlyAttached.php b/src/Rules/NotExactlyAttached.php index 102575e9c051c72bdf97ee6216b613042e8dcaa4..6b42246ae52aec2e917256fcd1f1dc0dc755ecb1 100644 --- a/src/Rules/NotExactlyAttached.php +++ b/src/Rules/NotExactlyAttached.php @@ -33,7 +33,7 @@ class NotExactlyAttached implements Rule $pivot = $relation->newPivot(); $pivotAccessor = $relation->getPivotAccessor(); $query = $relation->withoutGlobalScopes() - ->where($relation->getQualifiedRelatedPivotKeyName(), '=', $this->request->input($this->request->relatedResource)); + ->where($relation->getQualifiedRelatedPivotKeyName(), '=', $this->request->input($this->request->relatedResource)); $resource = Nova::newResourceFromModel($this->model); diff --git a/src/Rules/Relatable.php b/src/Rules/Relatable.php index a301d333b26774343da3a6f3d48b663ac365cd66..33963e5c302bb844b55d62828e6bd2adb0835af2 100644 --- a/src/Rules/Relatable.php +++ b/src/Rules/Relatable.php @@ -65,7 +65,7 @@ class Relatable implements Rule protected function relationshipIsFull(Model $model, string $attribute, mixed $value): bool { $inverseRelation = $this->request->newResource() - ->resolveInverseFieldsForAttribute($this->request, $attribute)->first(static function ($field) { + ->resolveInverseFieldsForAttribute($this->request, $attribute)->first(static function ($field) { return ($field instanceof MorphOne || $field instanceof HasOne) && ! $field->ofManyRelationship(); }); diff --git a/src/Tools/Dashboard.php b/src/Tools/Dashboard.php index 47addd0016de869f8ae4eb85dfe9b7bb5c50f2dd..aa5aa92fd0cfd40d1a36077e29ff0a40348fff66 100644 --- a/src/Tools/Dashboard.php +++ b/src/Tools/Dashboard.php @@ -22,7 +22,7 @@ class Dashboard extends Tool return MenuSection::make( Nova::__('Dashboards'), $dashboards->map(fn ($dashboard) => $dashboard->menu($request)) )->collapsable() - ->icon('squares-2-x-2'); + ->icon('squares-2-x-2'); } if ($dashboards->count() == 1) { diff --git a/src/Util.php b/src/Util.php index 914a2a1ab3345be8366252b947f2033c8692621d..e4770862f44e8d55870b77b12b8a604f77a5dc75 100644 --- a/src/Util.php +++ b/src/Util.php @@ -89,8 +89,8 @@ class Util "{$appNamespace}Providers\FortifyServiceProvider", "{$appNamespace}Providers\JetstreamServiceProvider", ])->map(static fn ($provider) => app()->getProvider($provider)) - ->filter() - ->isNotEmpty(); + ->filter() + ->isNotEmpty(); } /** @@ -232,8 +232,8 @@ class Util 'Prohibits', 'Same', ])->transform(static fn ($rule) => Str::snake($rule)) - ->mapWithKeys(static fn ($rule) => ["{$rule}:" => "{$rule}:{$attribute}."]) - ->all(); + ->mapWithKeys(static fn ($rule) => ["{$rule}:" => "{$rule}:{$attribute}."]) + ->all(); } /**