From 2587ae7540734c95e2e5463e2369f14510163836 Mon Sep 17 00:00:00 2001 From: lee-to Date: Wed, 5 Feb 2025 15:36:43 +0000 Subject: [PATCH 1/2] [rector] Rector fixes --- src/Laravel/src/Fields/Relationships/BelongsToMany.php | 5 ++--- src/Laravel/src/Fields/Relationships/HasMany.php | 1 - src/UI/src/Fields/Json.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Laravel/src/Fields/Relationships/BelongsToMany.php b/src/Laravel/src/Fields/Relationships/BelongsToMany.php index 35d55a8b6..d187f8bbd 100644 --- a/src/Laravel/src/Fields/Relationships/BelongsToMany.php +++ b/src/Laravel/src/Fields/Relationships/BelongsToMany.php @@ -25,7 +25,6 @@ use MoonShine\Laravel\Traits\Fields\WithAsyncSearch; use MoonShine\Laravel\Traits\Fields\WithRelatedLink; use MoonShine\Laravel\Traits\Fields\WithRelatedValues; -use MoonShine\Support\DTOs\Select\Options; use MoonShine\Support\Enums\Color; use MoonShine\UI\Collections\ActionButtons; use MoonShine\UI\Components\ActionButton; @@ -388,7 +387,7 @@ protected function resolveOldValue(mixed $old): mixed $oldPivot = $this->getCore()->getRequest()->getOld($this->getPivotName()); return collect($old) - ->map(fn ($key) => clone $this->makeRelatedModel($key, relations: $oldPivot[$key] ?? [])) + ->map(fn ($key): ?Model => clone $this->makeRelatedModel($key, relations: $oldPivot[$key] ?? [])) ->values(); } @@ -581,7 +580,7 @@ public function prepareReactivityValue(mixed $value, mixed &$casted, array &$exc { $casted = $this->getRelatedModel(); $value = collect($value) - ->map(fn ($key) => clone $this->makeRelatedModel($key)) + ->map(fn ($key): ?Model => clone $this->makeRelatedModel($key)) ->values(); $casted?->setRelation($this->getRelationName(), $value); diff --git a/src/Laravel/src/Fields/Relationships/HasMany.php b/src/Laravel/src/Fields/Relationships/HasMany.php index e6682d241..6fa8429df 100644 --- a/src/Laravel/src/Fields/Relationships/HasMany.php +++ b/src/Laravel/src/Fields/Relationships/HasMany.php @@ -18,7 +18,6 @@ use MoonShine\Contracts\UI\ComponentContract; use MoonShine\Contracts\UI\FieldContract; use MoonShine\Contracts\UI\FieldWithComponent; -use MoonShine\Contracts\UI\FormBuilderContract; use MoonShine\Contracts\UI\HasFieldsContract; use MoonShine\Contracts\UI\TableBuilderContract; use MoonShine\Laravel\Buttons\HasManyButton; diff --git a/src/UI/src/Fields/Json.php b/src/UI/src/Fields/Json.php index 037397b11..ee5cbc99e 100644 --- a/src/UI/src/Fields/Json.php +++ b/src/UI/src/Fields/Json.php @@ -451,7 +451,7 @@ public function getComponent(): ComponentContract fn (TableBuilder $tableBuilder) => value($this->modifyTable, $tableBuilder, $this->isPreviewMode()), ); - if(!$this->isObjectMode() && !$this->isPreviewMode()) { + if(!$this->isPreviewMode()) { $component = $component ->editable() ->reindex(prepared: true) From 798fbb85972d52cc3f64c4250484da5edc71db34 Mon Sep 17 00:00:00 2001 From: lee-to Date: Wed, 5 Feb 2025 15:37:12 +0000 Subject: [PATCH 2/2] Fix styling --- src/Laravel/src/Fields/Relationships/BelongsTo.php | 2 +- src/Laravel/src/Fields/Relationships/BelongsToMany.php | 6 +++--- src/Laravel/src/Fields/Relationships/HasMany.php | 2 +- src/Laravel/src/Fields/Relationships/HasOne.php | 2 +- src/Laravel/src/Fields/Relationships/ModelRelationField.php | 4 ++-- src/Laravel/src/Fields/Relationships/MorphTo.php | 2 +- src/Laravel/src/Fields/Relationships/RelationRepeater.php | 4 ++-- src/UI/src/Fields/Json.php | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Laravel/src/Fields/Relationships/BelongsTo.php b/src/Laravel/src/Fields/Relationships/BelongsTo.php index 46e01edfc..8f14099d0 100644 --- a/src/Laravel/src/Fields/Relationships/BelongsTo.php +++ b/src/Laravel/src/Fields/Relationships/BelongsTo.php @@ -73,7 +73,7 @@ protected function resolvePreview(): string protected function resolveValue(): mixed { - if($this->isOldValue()) { + if ($this->isOldValue()) { return $this->toValue(); } diff --git a/src/Laravel/src/Fields/Relationships/BelongsToMany.php b/src/Laravel/src/Fields/Relationships/BelongsToMany.php index d187f8bbd..0455379ba 100644 --- a/src/Laravel/src/Fields/Relationships/BelongsToMany.php +++ b/src/Laravel/src/Fields/Relationships/BelongsToMany.php @@ -263,7 +263,7 @@ public function setValues(array $values): void public function getAvailableValues(): mixed { - if(!\is_null($this->memoizeValues)) { + if (! \is_null($this->memoizeValues)) { return $this->memoizeValues; } @@ -305,7 +305,7 @@ public function getAvailableValues(): mixed public function getComponent(): ComponentContract { - if(!\is_null($this->resolvedComponent)) { + if (! \is_null($this->resolvedComponent)) { return $this->resolvedComponent; } @@ -380,7 +380,7 @@ protected function getColumnOrFormattedValue(Model $item, string|int $default): protected function resolveOldValue(mixed $old): mixed { // otherwise you will have to make a db query to receive records by keys - if($this->isAsyncSearch()) { + if ($this->isAsyncSearch()) { return $this->toValue(); } diff --git a/src/Laravel/src/Fields/Relationships/HasMany.php b/src/Laravel/src/Fields/Relationships/HasMany.php index 6fa8429df..2189000f0 100644 --- a/src/Laravel/src/Fields/Relationships/HasMany.php +++ b/src/Laravel/src/Fields/Relationships/HasMany.php @@ -565,7 +565,7 @@ protected function resolveValue(): mixed */ public function getComponent(): ComponentContract { - if(!\is_null($this->resolvedComponent)) { + if (! \is_null($this->resolvedComponent)) { return $this->resolvedComponent; } diff --git a/src/Laravel/src/Fields/Relationships/HasOne.php b/src/Laravel/src/Fields/Relationships/HasOne.php index c1aa0524a..26200a128 100644 --- a/src/Laravel/src/Fields/Relationships/HasOne.php +++ b/src/Laravel/src/Fields/Relationships/HasOne.php @@ -212,7 +212,7 @@ public function modifyTable(Closure $callback): static */ public function getComponent(): ComponentContract { - if(!\is_null($this->resolvedComponent)) { + if (! \is_null($this->resolvedComponent)) { return $this->resolvedComponent; } diff --git a/src/Laravel/src/Fields/Relationships/ModelRelationField.php b/src/Laravel/src/Fields/Relationships/ModelRelationField.php index 657d578b2..0bf701181 100644 --- a/src/Laravel/src/Fields/Relationships/ModelRelationField.php +++ b/src/Laravel/src/Fields/Relationships/ModelRelationField.php @@ -262,13 +262,13 @@ public function makeRelatedModel(int|string $key, array $attributes = [], array { $related = $this->getRelatedModel(); - if(\is_null($related)) { + if (\is_null($related)) { return null; } return $related->forceFill([ $related->getKeyName() => $key, - ...$attributes + ...$attributes, ])->setRelations($relations); } diff --git a/src/Laravel/src/Fields/Relationships/MorphTo.php b/src/Laravel/src/Fields/Relationships/MorphTo.php index 84056f2b7..1c2d2d3d6 100644 --- a/src/Laravel/src/Fields/Relationships/MorphTo.php +++ b/src/Laravel/src/Fields/Relationships/MorphTo.php @@ -163,7 +163,7 @@ public function getTypeValue(): string protected function resolveValue(): string { - if($this->isOldValue()) { + if ($this->isOldValue()) { return $this->toValue(); } diff --git a/src/Laravel/src/Fields/Relationships/RelationRepeater.php b/src/Laravel/src/Fields/Relationships/RelationRepeater.php index 212363c4c..6a90af418 100644 --- a/src/Laravel/src/Fields/Relationships/RelationRepeater.php +++ b/src/Laravel/src/Fields/Relationships/RelationRepeater.php @@ -230,7 +230,7 @@ protected function resolveValue(): mixed protected function resolveOldValue(mixed $old): mixed { foreach ($this->getFields() as $field) { - if($field instanceof Json) { + if ($field instanceof Json) { foreach ($old as $index => $value) { $column = $field->getColumn(); $old[$index][$column] = $field->prepareOnApplyRecursive( @@ -248,7 +248,7 @@ protected function resolveOldValue(mixed $old): mixed */ public function getComponent(): ComponentContract { - if(!\is_null($this->resolvedComponent)) { + if (! \is_null($this->resolvedComponent)) { return $this->resolvedComponent; } diff --git a/src/UI/src/Fields/Json.php b/src/UI/src/Fields/Json.php index ee5cbc99e..45c688189 100644 --- a/src/UI/src/Fields/Json.php +++ b/src/UI/src/Fields/Json.php @@ -348,7 +348,7 @@ public function prepareOnApplyRecursive(iterable $collection): array $collection = $this->prepareOnApply($collection); foreach ($this->getFields() as $field) { - if($field instanceof self) { + if ($field instanceof self) { foreach ($collection as $index => $value) { $column = $field->getColumn(); $collection[$index][$column] = $field->prepareOnApplyRecursive( @@ -371,7 +371,7 @@ protected function resolveOldValue(mixed $old): mixed public function getComponent(): ComponentContract { - if(!\is_null($this->resolvedComponent)) { + if (! \is_null($this->resolvedComponent)) { return $this->resolvedComponent; } @@ -451,7 +451,7 @@ public function getComponent(): ComponentContract fn (TableBuilder $tableBuilder) => value($this->modifyTable, $tableBuilder, $this->isPreviewMode()), ); - if(!$this->isPreviewMode()) { + if (! $this->isPreviewMode()) { $component = $component ->editable() ->reindex(prepared: true)