schema file generation clean up

Author: cblanquera

src/Fieldset.php

@@ -613,6 +613,27 @@ public function restore(?string $path = null): Fieldset
    */
   public function save(string $path = null): Fieldset
   {
+    //if there are fields
+    if (is_array($this->get('fields'))) {
+      //clean up defaults
+      foreach ($this->get('fields') as $i => $field) {
+        //unset root
+        $this->remove('fields', $i, 'root');
+        //convert default
+        if (isset($field['default'])) {
+          if ($field['default'] === '') {
+            $this->set('fields', $i, 'default', null);
+          } else if (is_numeric($field['default'])) {
+            if (strpos($field['default'], '.') === false) {
+              $this->set('fields', $i, 'default', (int) $field['default']);
+            } else {
+              $this->set('fields', $i, 'default', (float) $field['default']);
+            }
+          }
+        }
+      }
+    }
+
     if (is_null($path) || !is_dir($path)) {
       $path = static::$path;
     }

src/Package/System/SystemPackage.php

@@ -228,7 +228,7 @@ public function getInnerJoins(Schema $schema, array $data): array
         || ($isRecursive && isset($data['span'][$primary1]));
 
       $isJoin = (
-        $many === 1 && (
+        $many == 1 && (
           $data['join'] === 'all' || $data['join'] === 'forward')
         )
         || (
@@ -279,7 +279,7 @@ public function getInnerJoins(Schema $schema, array $data): array
       $isSpan = isset($data['filter'][$primary1]);
 
       $isJoin = (
-        $many === 1 && (
+        $many == 1 && (
           $data['join'] === 'all' || $data['join'] === 'reverse')
         )
         || (

src/Package/System/events/schema.php

@@ -47,7 +47,7 @@
     'fields',
     'relations',
     'suggestion',
-    'disable',
+    'disabled',
     'placeholder'
   ];
 
@@ -369,7 +369,7 @@
     'fields',
     'relations',
     'suggestion',
-    'disable',
+    'disabled',
     'placeholder'
   ];
 

src/Schema.php

@@ -229,6 +229,47 @@ protected function getTypes(array $field): array
     return $types;
   }
 
+  /**
+   * Saves the fieldset to file
+   *
+   * @return Fieldset
+   */
+  public function save(string $path = null): Fieldset
+  {
+    //if there are fields
+    if (is_array($this->get('fields'))) {
+      //clean up indexes
+      foreach ($this->get('fields') as $i => $field) {
+        if (!isset($field['searchable'])) {
+          $field['searchable'] = 0;
+        }
+
+        if (!isset($field['filterable'])) {
+          $field['filterable'] = 0;
+        }
+
+        if (!isset($field['sortable'])) {
+          $field['sortable'] = 0;
+        }
+
+        $this->set('fields', $i, 'searchable', (int) $field['searchable']);
+        $this->set('fields', $i, 'filterable', (int) $field['filterable']);
+        $this->set('fields', $i, 'sortable', (int) $field['sortable']);
+      }
+    }
+
+    //if there are relations
+    if (is_array($this->get('relations'))) {
+      foreach ($this->get('relations') as $i => $relation) {
+        if (isset($relation['many'])) {
+          $this->set('relations', $i, 'many', (int) $relation['many']);
+        }
+      }
+    }
+
+    return parent::save($path);
+  }
+
   /**
    * Returns fieldset classes that match the given filters
    *