Various Corrections to Baked Files

loadsys · Jun 20, 2016 · e14e6b4 · e14e6b4
1 parent 1eb60b3
commit e14e6b4
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 67 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -10,58 +10,17 @@
 use Cake\Event\EventManager;
 
 /**
- * Install our own BakeHelper.
+ * Default to the LoadsysTheme and install our own BakeHelper.
  */
 EventManager::instance()->on('Bake.initialize', function (Event $event) {
 	$view = $event->subject;
 
-	// Load our overridden BakeHelper class.
+	// Use the LoadsysTheme if none was explicitly named.
+	if (empty($view->theme())) {
+		$view->theme('LoadsysTheme');
+	}
+
+	// Swap in our overridden BakeHelper class.
 	$view->helpers()->unload('Bake');
 	$view->loadHelper('LoadsysTheme.Bake');
 });
-
-/**
- * Change viewVars globally.
- */
-// EventManager::instance()->on('Bake.beforeRender', function (Event $event) {
-//     $view = $event->subject;
-//
-//     // Use $rows for the main data variable in indexes
-//     if ($view->get('pluralName')) {
-//         $view->set('pluralName', 'rows');
-//     }
-//     if ($view->get('pluralVar')) {
-//         $view->set('pluralVar', 'rows');
-//     }
-//
-//     // Use $theOne for the main data variable in view/edit
-//     if ($view->get('singularName')) {
-//         $view->set('singularName', 'theOne');
-//     }
-//     if ($view->get('singularVar')) {
-//         $view->set('singularVar', 'theOne');
-//     }
-// });
-
-//
-/**
- * Example of injecting viewVars for a specific generated file:
- */
-// EventManager::instance()->on(
-//     'Bake.beforeRender.Controller.controller',
-//     function (Event $event) {
-//         $view = $event->subject();
-//         if ($view->viewVars['name'] == 'Users') {
-//             // add the login and logout actions to the Users controller
-//             $view->viewVars['actions'] = [
-//                 'login',
-//                 'logout',
-//                 'index',
-//                 'view',
-//                 'add',
-//                 'edit',
-//                 'delete'
-//             ];
-//         }
-//     }
-// );
diff --git a/src/Template/Bake/Element/Controller/edit.ctp b/src/Template/Bake/Element/Controller/edit.ctp
@@ -27,7 +27,7 @@ $compact = ["'" . $singularName . "'"];
 	 */
 	public function edit($id = null) {
 		$<%= $singularName %> = $this-><%= $currentModelName %>->get($id, [
-			'contain' => [<%= $this->Bake->stringifyList($belongsToMany, ['indent' => false]) %>]
+			'contain' => [<%= $this->Bake->stringifyList($belongsToMany, ['indent' => false]) %>],
 		]);
 		if ($this->request->is(['patch', 'post', 'put'])) {
 			$<%= $singularName %> = $this-><%= $currentModelName %>->patchEntity($<%= $singularName %>, $this->request->data);

diff --git a/src/Template/Bake/Element/Controller/index.ctp b/src/Template/Bake/Element/Controller/index.ctp
@@ -24,7 +24,7 @@
 <% if ($belongsTo):
 	$belongsTo = array_diff($belongsTo, $ignoreAssociations); %>
 		$this->paginate = [
-			'contain' => [<%= $this->Bake->stringifyList($belongsTo, ['indent' => false]) %>]
+			'contain' => [<%= $this->Bake->stringifyList($belongsTo, ['indent' => false]) %>],
 		];
 <% endif; %>
 		$this->set('<%= $pluralName %>', $this->paginate($this-><%= $currentModelName %>));

diff --git a/src/Template/Bake/Element/Controller/view.ctp b/src/Template/Bake/Element/Controller/view.ctp
@@ -30,7 +30,7 @@ $allAssociations = array_merge(
 	 */
 	public function view($id = null) {
 		$<%= $singularName%> = $this-><%= $currentModelName %>->get($id, [
-			'contain' => [<%= $this->Bake->stringifyList($allAssociations, ['indent' => false]) %>]
+			'contain' => [<%= $this->Bake->stringifyList($allAssociations, ['indent' => false]) %>],
 		]);
 		$this->set('<%= $singularName %>', $<%= $singularName %>);
 		$this->set('_serialize', ['<%= $singularName %>']);

diff --git a/src/Template/Bake/Element/add-foreign-keys-from-create.ctp b/src/Template/Bake/Element/add-foreign-keys-from-create.ctp
@@ -1,3 +1,3 @@
 <% foreach ($constraints as $table => $tableConstraints):
-	echo $this->element('Migrations.add-foreign-keys', ['constraints' => $tableConstraints, 'table' => $table]);
+	echo $this->element('LoadsysTheme.add-foreign-keys', ['constraints' => $tableConstraints, 'table' => $table]);
 endforeach; %>
diff --git a/src/Template/Bake/Element/create-tables.ctp b/src/Template/Bake/Element/create-tables.ctp
@@ -9,10 +9,10 @@ $specialPk = (count($primaryKeys) > 1 || $primaryKeys[0]['name'] !== 'id' || $pr
 %>
 <% if ($specialPk): %>
 
-		$this->table('<%= $tableArgForArray %>', ['id' => false, 'primary_key' => ['<%= implode("', '", \Cake\Utility\Hash::extract($primaryKeys, '{n}.name')) %>']])
+		$this->table('<%= $tableArgForArray %>', ['id' => false, 'primary_key' => ['<%= implode("', '", \Cake\Utility\Hash::extract($primaryKeys, '{n}.name')) %>'], ['comment' => '']])
 <% else: %>
 
-		$this->table('<%= $tableArgForArray %>')
+		$this->table('<%= $tableArgForArray %>', ['comment' => ''])
 <% endif; %>
 <% if ($specialPk || !$autoId):
 	foreach ($primaryKeys as $primaryKey) :
@@ -30,6 +30,8 @@ foreach ($this->Migration->columns($tableArgForMethods) as $column => $config):
 %>
 			->addColumn('<%= $column %>', '<%= $config['columnType'] %>', [<%
 			$columnOptions = $this->Migration->getColumnOption($config['options']);
+			$columnOptions['comment'] = '';
+			//@TODO: init proper integrity checks matching MigrationsTest from skeleton. (Example: int id must be signed=false)
 			if ($config['columnType'] === 'boolean' && isset($columnOptions['default']) && $this->Migration->value($columnOptions['default']) !== 'null'):
 				$columnOptions['default'] = (bool)$columnOptions['default'];
 			endif;
@@ -76,5 +78,5 @@ endforeach; %>
 			->create();
 <% endforeach; %>
 <% if (!empty($constraints)): %>
-<% echo $this->element('Migrations.add-foreign-keys-from-create', ['constraints' => $constraints]); %>
+<% echo $this->element('LoadsysTheme.add-foreign-keys-from-create', ['constraints' => $constraints]); %>
 <% endif; %>
diff --git a/src/Template/Bake/config/diff.ctp b/src/Template/Bake/config/diff.ctp
@@ -104,7 +104,7 @@ class <%= $name %> extends AbstractMigration {
         <%- endif; %>
         <%- endforeach; %>
         <%- if (!empty($tables['add'])): %>
-                <%- echo $this->element('Migrations.create-tables', ['tables' => $tables['add'], 'autoId' => $autoId, 'useSchema' => true]) %>
+                <%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables['add'], 'autoId' => $autoId, 'useSchema' => true]) %>
         <%- endif; %>
         <%- foreach ($data as $tableName => $tableDiff): %>
             <%- if (!empty($tableDiff['columns']['add'])):
@@ -113,14 +113,14 @@ class <%= $name %> extends AbstractMigration {
 
         <%= $statement %>
             <%- endif; %>
-            <%- echo $this->element('Migrations.add-columns', ['columns' => $tableDiff['columns']['add']]) %>
+            <%- echo $this->element('LoadsysTheme.add-columns', ['columns' => $tableDiff['columns']['add']]) %>
             <%- endif; %>
             <%- if (!empty($tableDiff['indexes']['add'])):
             $statement = $this->Migration->tableStatement($tableName);
             if (!empty($statement)): %>
         <%= $statement %>
             <%- endif; %>
-            <%- echo $this->element('Migrations.add-indexes', ['indexes' => $tableDiff['indexes']['add']]) %>
+            <%- echo $this->element('LoadsysTheme.add-indexes', ['indexes' => $tableDiff['indexes']['add']]) %>
             <%- endif;
             if (isset($this->Migration->tableStatements[$tableName])): %>
             ->update();
@@ -170,7 +170,7 @@ class <%= $name %> extends AbstractMigration {
             <%- endforeach; %>
         <%- endif; %>
         <%- if (!empty($tables['remove'])): %>
-            <%- echo $this->element('Migrations.create-tables', ['tables' => $tables['remove'], 'autoId' => $autoId, 'useSchema' => true]) %>
+            <%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables['remove'], 'autoId' => $autoId, 'useSchema' => true]) %>
         <%- endif; %>
         <%- foreach ($data as $tableName => $tableDiff): %>
             <%- if (!empty($tableDiff['indexes']['add'])): %>
@@ -190,7 +190,7 @@ class <%= $name %> extends AbstractMigration {
         <%= $this->Migration->tableStatement($tableName, true) %>
         <%- endif; %>
         <%- if (!empty($tableDiff['columns']['remove'])): %>
-        <%- echo $this->element('Migrations.add-columns', ['columns' => $tableDiff['columns']['remove']]) %>
+        <%- echo $this->element('LoadsysTheme.add-columns', ['columns' => $tableDiff['columns']['remove']]) %>
         <%- endif; %>
         <%- if (!empty($tableDiff['columns']['changed'])):
             $oldTableDef = $dumpSchema[$tableName];
@@ -213,7 +213,7 @@ class <%= $name %> extends AbstractMigration {
             <%- endforeach; %>
         <%- endif; %>
             <%- if (!empty($tableDiff['indexes']['remove'])): %>
-            <%- echo $this->element('Migrations.add-indexes', ['indexes' => $tableDiff['indexes']['remove']]) %>
+            <%- echo $this->element('LoadsysTheme.add-indexes', ['indexes' => $tableDiff['indexes']['remove']]) %>
             <%- endif;
             if (isset($this->Migration->tableStatements[$tableName])): %>
             ->update();

diff --git a/src/Template/Bake/config/skeleton.ctp b/src/Template/Bake/config/skeleton.ctp
@@ -47,7 +47,7 @@ class <%= $name %> extends AbstractMigration {
 	 */
 	public function change() {
 <% foreach ($tables as $table): %>
-		$table = $this->table('<%= $table%>');
+		$table = $this->table('<%= $table%>', ['comment' => '']);
 <% if ($tableMethod !== 'drop') : %>
 <% if ($columnMethod === 'removeColumn'): %>
 <% foreach ($columns['fields'] as $column => $config): %>
@@ -61,14 +61,14 @@ class <%= $name %> extends AbstractMigration {
 		$table-><%= $columnMethod %>('<%= $column %>', '<%= $config['columnType'] %>', [<%
 				$columnOptions = $config['options'];
 				$columnOptions = array_intersect_key($columnOptions, $wantedOptions);
+				$columnOptions['comment'] = '';
 				echo $this->Bake->stringifyList($columnOptions, ['indent' => 3]);
 			%>]);
 <% endforeach; %>
 <% foreach ($columns['indexes'] as $column => $config): %>
 		$table-><%= $indexMethod %>([<%=
 				$this->Bake->stringifyList($config['columns'], ['indent' => 3])
 				%>], [<%
-				$options = [];
 				echo $this->Bake->stringifyList($config['options'], ['indent' => 3]);
 			%>]);
 <% endforeach; %>

diff --git a/src/Template/Bake/config/snapshot.ctp b/src/Template/Bake/config/snapshot.ctp
@@ -52,7 +52,7 @@ class <%= $name %> extends AbstractMigration {
 	 * @return void
 	 */
 	public function up() {
-		<%- echo $this->element('Migrations.create-tables', ['tables' => $tables, 'autoId' => $autoId, 'useSchema' => false]) %>
+		<%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables, 'autoId' => $autoId, 'useSchema' => false]) %>
 	}
 
 	/**

diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
@@ -14,8 +14,8 @@ class BakeHelper extends BaseBakeHelper {
 	/**
 	 * Returns an array converted into a formatted multiline string
 	 *
-	 * This version uses tabs by default, and includes a trailing comma on
-	 * multi-line arrays by default.
+	 * This version uses tabs by default, and includes a trailing comma (on
+	 * multi-line arrays only) by default.
 	 *
 	 * @param array $list array of items to be stringified
 	 * @param array $options options to use
@@ -25,7 +25,12 @@ public function stringifyList(array $list, array $options = []) {
 		$options += [
 			'indent' => 2,
 			'tab' => "\t",
-			'trailingComma' => true,
+		];
+
+		// MUST be layered in a second pass to pick up the layered [indent]
+		// value from the first pass!
+		$options += [
+			'trailingComma' => ($options['indent'] !== false),
 		];
 
 		return parent::stringifyList($list, $options);