Updated the table template, and updated the form

Author: David Yell

README.md

@@ -79,6 +79,7 @@ bin/cake bake template --theme=NiceAdminBakeTheme --prefix=Admin Examples
 * Added handling for date, datetime and time using the Time helper
 * Added handling for boolean data using Bootstrap icons
 * Updated the View template to use Bootstrap panels
+* Spaced out the Table definition functions
 
 # License
 A custom cakephp/bake theme for generating customised cakephp code and templates. 

src/Template/Bake/Element/form.ctp

@@ -38,11 +38,11 @@ $fields = collection($fields)
                 } else {
                     if (empty($fieldData['null'])) {
 %>
-                        echo $this->Form->input('<%= $field %>'); <% // Required fields %>
+            echo $this->Form->input('<%= $field %>'); <% // Required fields %>
 <%
                     } else {
 %>
-                        echo $this->Form->input('<%= $field %>');
+            echo $this->Form->input('<%= $field %>');
 <%
                     }
 

src/Template/Bake/Model/table.ctp

@@ -0,0 +1,169 @@
+<%
+use Cake\Utility\Inflector;
+%>
+<?php
+namespace <%= $namespace %>\Model\Table;
+
+<%
+$uses = [
+    "use $namespace\\Model\\Entity\\$entity;",
+    'use Cake\ORM\Query;',
+    'use Cake\ORM\RulesChecker;',
+    'use Cake\ORM\Table;',
+    'use Cake\Validation\Validator;'
+];
+sort($uses);
+echo implode("\n", $uses);
+%>
+
+
+/**
+ * <%= $name %> Model
+<% if ($associations): %>
+ *
+<% foreach ($associations as $type => $assocs): %>
+<% foreach ($assocs as $assoc): %>
+ * @property \Cake\ORM\Association\<%= Inflector::camelize($type) %> $<%= $assoc['alias'] %>
+<% endforeach %>
+<% endforeach; %>
+<% endif; %>
+ */
+class <%= $name %>Table extends Table
+{
+
+    /**
+     * Initialize method
+     *
+     * @param array $config The configuration for the Table.
+     * @return void
+     */
+    public function initialize(array $config)
+    {
+<% if (!empty($table)): %>
+        $this->table('<%= $table %>');
+<% endif %>
+<% if (!empty($displayField)): %>
+        $this->displayField('<%= $displayField %>');
+<% endif %>
+<% if (!empty($primaryKey)): %>
+<% if (count($primaryKey) > 1): %>
+        $this->primaryKey([<%= $this->Bake->stringifyList((array)$primaryKey, ['indent' => false]) %>]);
+<% else: %>
+        $this->primaryKey('<%= current((array)$primaryKey) %>');
+<% endif %>
+<% endif %>
+
+<% foreach ($behaviors as $behavior => $behaviorData): %>
+        $this->addBehavior('<%= $behavior %>'<%= $behaviorData ? ", [" . implode(', ', $behaviorData) . ']' : '' %>);
+<% endforeach %>
+
+<% foreach ($associations as $type => $assocs): %>
+<% foreach ($assocs as $assoc):
+	$alias = $assoc['alias'];
+	unset($assoc['alias']);
+%>
+        $this-><%= $type %>('<%= $alias %>', [<%= $this->Bake->stringifyList($assoc, ['indent' => 3]) %>]);
+<% endforeach %>
+<% endforeach %>
+    }
+<% if (!empty($validation)): %>
+
+    /**
+     * Default validation rules.
+     *
+     * @param \Cake\Validation\Validator $validator Validator instance.
+     * @return \Cake\Validation\Validator
+     */
+    public function validationDefault(Validator $validator)
+    {
+        $validator
+<% $validationMethods = []; %>
+<%
+$firstField = true;
+foreach ($validation as $field => $rules):
+    if ($firstField !== true):
+        $validationMethods[] = "\n        \$validator";
+    endif;
+
+    foreach ($rules as $ruleName => $rule):
+        if ($rule['rule'] && !isset($rule['provider'])):
+            $validationMethods[] = sprintf(
+                "->add('%s', '%s', ['rule' => '%s'])",
+                $field,
+                $ruleName,
+                $rule['rule']
+            );
+        elseif ($rule['rule'] && isset($rule['provider'])):
+            $validationMethods[] = sprintf(
+                "->add('%s', '%s', ['rule' => '%s', 'provider' => '%s'])",
+                $field,
+                $ruleName,
+                $rule['rule'],
+                $rule['provider']
+            );
+        endif;
+
+        if (isset($rule['allowEmpty'])):
+            if (is_string($rule['allowEmpty'])):
+                $validationMethods[] = sprintf(
+                    "->allowEmpty('%s', '%s')",
+                    $field,
+                    $rule['allowEmpty']
+                );
+            elseif ($rule['allowEmpty']):
+                $validationMethods[] = sprintf(
+                    "->allowEmpty('%s')",
+                    $field
+                );
+            else:
+                $validationMethods[] = sprintf(
+                    "->requirePresence('%s', 'create')",
+                    $field
+                );
+                $validationMethods[] = sprintf(
+                    "->notEmpty('%s')",
+                    $field
+                );
+            endif;
+        endif;
+    endforeach;
+    $firstField = false;
+    $validationMethods[] = array_pop($validationMethods) . ";";
+endforeach;
+%>
+<%= "            " . implode("\n            ", $validationMethods) %>
+
+
+        return $validator;
+    }
+<% endif %>
+<% if (!empty($rulesChecker)): %>
+
+    /**
+     * Returns a rules checker object that will be used for validating
+     * application integrity.
+     *
+     * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
+     * @return \Cake\ORM\RulesChecker
+     */
+    public function buildRules(RulesChecker $rules)
+    {
+    <%- foreach ($rulesChecker as $field => $rule): %>
+        $rules->add($rules-><%= $rule['name'] %>(['<%= $field %>']<%= !empty($rule['extra']) ? ", '$rule[extra]'" : '' %>));
+    <%- endforeach; %>
+        return $rules;
+    }
+<% endif; %>
+<% if ($connection != 'default'): %>
+
+    /**
+     * Returns the database connection name to use by default.
+     *
+     * @return string
+     */
+    public static function defaultConnectionName()
+    {
+        return '<%= $connection %>';
+    }
+<% endif; %>
+}