Update Composer packages

kirby/config/fields/mixins/options.php

@@ -1,6 +1,6 @@
 <?php
 
-use Kirby\Form\Options;
+use Kirby\Field\FieldOptions;
 
 return [
 	'props' => [
@@ -30,19 +30,18 @@ return [
 	],
 	'methods' => [
 		'getOptions' => function () {
-			return Options::factory(
-				$this->options(),
-				$this->props,
-				$this->model()
-			);
+			$props   = FieldOptions::polyfill($this->props);
+			$options = FieldOptions::factory($props['options']);
+			return $options->render($this->model());
 		},
-		'sanitizeOption' => function ($option) {
-			$allowed = array_column($this->options(), 'value');
-			return in_array($option, $allowed, true) === true ? $option : null;
+		'sanitizeOption' => function ($value) {
+			$options = array_column($this->options(), 'value');
+			return in_array($value, $options, true) === true ? $value : null;
 		},
-		'sanitizeOptions' => function ($options) {
-			$allowed = array_column($this->options(), 'value');
-			return array_intersect($options, $allowed);
+		'sanitizeOptions' => function ($values) {
+			$options = array_column($this->options(), 'value');
+			$options = array_intersect($values, $options);
+			return array_values($options);
 		},
 	]
 ];

kirby/config/fields/mixins/picker.php

@@ -1,6 +1,7 @@
 <?php
 
 use Kirby\Toolkit\I18n;
+use Kirby\Toolkit\Str;
 
 return [
 	'props' => [
@@ -67,12 +68,21 @@ return [
 			return $search;
 		},
 
+		/**
+		 * Whether to store UUID or ID in the
+		 * content file of the model
+		 *
+		 * @param string $store 'uuid'|'id'
+		 */
+		'store' => function (string $store = 'uuid') {
+			return Str::lower($store);
+		},
+
 		/**
 		 * Main text for each item
 		 */
 		'text' => function (string $text = null) {
 			return $text;
 		},
-
 	],
 ];

kirby/config/fields/mixins/upload.php

@@ -51,7 +51,7 @@ return [
 				$parent = $this->model();
 			}
 
-			if (is_a($parent, 'Kirby\Cms\File') === true) {
+			if ($parent instanceof File) {
 				$parent = $parent->parent();
 			}
 
@@ -62,7 +62,7 @@ return [
 					'filename' => $filename,
 				]);
 
-				if (is_a($file, 'Kirby\Cms\File') === false) {
+				if ($file instanceof File === false) {
 					throw new Exception('The file could not be uploaded');
 				}