Fix form schema ID getter

Also moved keys of higher importance to start of array,
easier to review this way

forms/FormFieldSchemaTrait.php

@@ -132,11 +132,11 @@ trait FormFieldSchemaTrait {
 	 */
 	public function getSchemaDataDefaults() {
 		return [
+			'name' => $this->getName(),
+			'id' => $this->ID(),
 			'type' => $this->getSchemaDataType(),
 			'component' => $this->getSchemaComponent(),
-			'id' => $this->ID,
 			'holder_id' => null,
-			'name' => $this->getName(),
 			'title' => $this->Title(),
 			'source' => null,
 			'extraClass' => $this->ExtraClass(),

tests/forms/FormSchemaTest.php

@@ -24,11 +24,11 @@ class FormSchemaTest extends SapphireTest {
 			'data' => [],
 			'fields' => [
 				[
-					'type' => "HiddenField",
-					'component' => null,
-					'id' => null,
-					'holder_id' => null,
+					'id' => 'Form_TestForm_SecurityID',
 					'name' => 'SecurityID',
+					'type' => "Hidden",
+					'component' => null,
+					'holder_id' => null,
 					'title' => 'Security ID',
 					'source' => null,
 					'extraClass' => 'hidden',