[5.x] Avoid collections in dictionary fields fieldtype (#10579)

statamic · Aug 6, 2024 · d446b3b · d446b3b
1 parent cbb1f97
commit d446b3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Fieldtypes/DictionaryFields.php b/src/Fieldtypes/DictionaryFields.php
@@ -30,17 +30,17 @@ public function preload()
         return [
             'type' => [
                 'fields' => $typeField->toPublishArray(),
-                'meta' => $typeField->meta(),
+                'meta' => $typeField->meta()->all(),
             ],
             'dictionaries' => Dictionary::all()->mapWithKeys(function (\Statamic\Dictionaries\Dictionary $dictionary) {
                 return [$dictionary->handle() => [
                     'fields' => $dictionary->fields()->toPublishArray(),
-                    'meta' => $dictionary->fields()->meta(),
+                    'meta' => $dictionary->fields()->meta()->all(),
                     'defaults' => $dictionary->fields()->all()->map(function ($field) {
                         return $field->fieldtype()->preProcess($field->defaultValue());
-                    }),
+                    })->all(),
                 ]];
-            }),
+            })->all(),
         ];
     }
 

diff --git a/tests/Fieldtypes/DictionaryFieldsTest.php b/tests/Fieldtypes/DictionaryFieldsTest.php
@@ -30,7 +30,7 @@ public function it_returns_dictionary_fields_in_preload()
                 'fields' => [
                     ['handle' => 'type', 'type' => 'select'],
                 ],
-                'meta' => collect(['type' => null]),
+                'meta' => ['type' => null],
             ],
         ], $preload);
 
@@ -39,10 +39,10 @@ public function it_returns_dictionary_fields_in_preload()
                 'fields' => [
                     ['handle' => 'category',  'type' => 'select'],
                 ],
-                'meta' => collect(['category' => null]),
-                'defaults' => collect(['category' => null]),
+                'meta' => ['category' => null],
+                'defaults' => ['category' => null],
             ],
-        ], $preload['dictionaries']->all());
+        ], $preload['dictionaries']);
     }
 
     #[Test]