Merge remote-tracking branch 'origin/validation' into validation

# Conflicts: # src/Fields/Layouts.php
moonshine-software · Feb 2, 2025 · 7df95f1 · 7df95f1
2 parents 0496c76 + 6da7f78
commit 7df95f1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/Fields/Layouts.php b/src/Fields/Layouts.php
@@ -77,7 +77,7 @@ public function addLayout(
             $headingAdditionalFields,
         );
 
-        if($validation !== []) {
+        if ($validation !== []) {
             $this->rules[$name] = $validation;
         }
 
@@ -358,24 +358,22 @@ function (Field $field) use ($value, $index, &$applyValues): void {
      */
     protected function resolveBeforeApply(mixed $data): mixed
     {
-        if($this->rules !== []) {
+        if ($this->rules !== []) {
             $value = $this->getRequestValue();
 
-            if(!is_array($value)) {
+            if (! is_array($value)) {
                 $value = [];
             }
 
-            $value = Collection::make($value)->mapToGroups(function ($v) {
-              return [$v['_layout'] => $v];
-            });
+            $value = Collection::make($value)->mapToGroups(fn ($v) => [$v['_layout'] => $v]);
 
             $rules = [];
             $attributes = [];
 
             foreach ($this->rules as $layoutName => $rule) {
                 $layout = $this->getLayouts()->findByName($layoutName);
 
-                if(\is_null($layout)) {
+                if (\is_null($layout)) {
                     continue;
                 }