Fix CS in generated migrations (remove trailing comma from drop_field…

… array)
CakeDC · Oct 16, 2014 · abc4c92 · abc4c92
1 parent c952119
commit abc4c92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Console/Command/MigrationShell.php b/Console/Command/MigrationShell.php
@@ -903,7 +903,10 @@ protected function _generateMigration($name, $class, $migration) {
 
 						$content .= "\t\t\t\t'" . $table . "' => array(";
 						if (!empty($fields)) {
-							$content .= "'" . implode("', '", $fields) . "', ";
+							$content .= "'" . implode("', '", $fields) . "'";
+						}
+						if (!empty($fields) && !empty($indexes)) {
+							$content .= ", ";
 						}
 						if (!empty($indexes)) {
 							$content .= "'indexes' => array('" . implode("', '", $indexes) . "')";

diff --git a/Test/Case/Console/Command/MigrationShellTest.php b/Test/Case/Console/Command/MigrationShellTest.php
@@ -808,7 +808,7 @@ public function testGenerateComparison() {
 
 		$pattern = <<<TEXT
 /			'drop_field' => array\(
-				'articles' => array\('slug',\),
+				'articles' => array\('slug'\),
 			\),/
 TEXT;
 		$this->assertRegExp(str_replace("\r\n", "\n", $pattern), $result);

diff --git a/Test/Fixture/test_migration_add_fields_from_cli.txt b/Test/Fixture/test_migration_add_fields_from_cli.txt
@@ -18,7 +18,7 @@
 		),
 		'down' => array(
 			'drop_field' => array(
-				'products' => array('id', 'created', 'modified', 'name', 'description', 'in_stock', 'price', 'stock_count',),
+				'products' => array('id', 'created', 'modified', 'name', 'description', 'in_stock', 'price', 'stock_count'),
 			),
 		),
 	);
diff --git a/Test/Fixture/test_migration_remove_fields_from_cli.txt b/Test/Fixture/test_migration_remove_fields_from_cli.txt
@@ -1,7 +1,7 @@
 	public $migration = array(
 		'up' => array(
 			'drop_field' => array(
-				'products' => array('name', 'description',),
+				'products' => array('name', 'description'),
 			),
 		),
 		'down' => array(