Move field tests into a common TestCase class

config/fields/structure.php

@@ -141,7 +141,7 @@
 				}
 
 				$column['type']  ??= $field['type'];
-				$column['label'] ??= $field['label'] ?? $name;
+				$column['label'] ??= $field['label'] ?? Str::ucfirst($name);
 				$column['label']   = I18n::translate($column['label'], $column['label']);
 
 				$columns[$name] = $column;

src/Api/Controller/Changes.php

@@ -6,7 +6,7 @@
 use Kirby\Content\Lock;
 use Kirby\Content\VersionId;
 use Kirby\Filesystem\F;
-use Kirby\Form\Form;
+use Kirby\Form\Reform;
 
 /**
  * The Changes controller takes care of the request logic
@@ -90,13 +90,13 @@ public static function publish(ModelWithContent $model, array $input): array
 	 */
 	public static function save(ModelWithContent $model, array $input): array
 	{
-		// we need to run the input through the form
-		// class to get a set of storable field values
-		// that we can send to the content storage handler
-		$form = Form::for($model, [
-			'ignoreDisabled' => true,
-			'input'          => $input,
-		]);
+		$form = new Reform(
+			model: $model,
+			language: 'current'
+		);
+
+		$form->fill($model);
+		$form->submit($input);
 
 		$changes = $model->version(VersionId::changes());
 		$latest  = $model->version(VersionId::latest());
@@ -110,7 +110,7 @@ public static function save(ModelWithContent $model, array $input): array
 		$changes->save(
 			fields: [
 				...$latest->read(),
-				...$form->strings(),
+				...$form->toStoredValues(),
 			],
 			language: 'current'
 		);

src/Cms/AppPlugins.php

@@ -813,8 +813,9 @@ protected function extensionsFromSystem(): void
 	{
 		// Always start with fresh fields and sections
 		// from the core and add plugins on top of that
-		FormField::$types = [];
-		Section::$types   = [];
+		FormField::$types  = [];
+		FormField::$setups = [];
+		Section::$types    = [];
 
 		// mixins
 		FormField::$mixins = $this->core->fieldMixins();

src/Content/Version.php

@@ -2,15 +2,14 @@
 
 namespace Kirby\Content;
 
-use Kirby\Cms\File;
 use Kirby\Cms\Language;
 use Kirby\Cms\Languages;
 use Kirby\Cms\ModelWithContent;
 use Kirby\Cms\Page;
 use Kirby\Cms\Site;
 use Kirby\Exception\LogicException;
 use Kirby\Exception\NotFoundException;
-use Kirby\Form\Form;
+use Kirby\Form\Reform;
 use Kirby\Http\Uri;
 
 /**
@@ -216,21 +215,13 @@ public function isIdentical(
 			$b['uuid']
 		);
 
-		$a = Form::for(
+		$form = new Reform(
 			model: $this->model,
-			props: [
-				'language' => $language->code(),
-				'values'   => $a,
-			]
-		)->values();
+			language: $language,
+		);
 
-		$b = Form::for(
-			model: $this->model,
-			props: [
-				'language' => $language->code(),
-				'values'   => $b
-			]
-		)->values();
+		$a = $form->fill($a)->toFormValues();
+		$b = $form->fill($b)->toFormValues();
 
 		ksort($a);
 		ksort($b);