tmukherjee13 / yii2-reverse-migration

console/components/Formatter.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
 
     public function getTableName($table)
     {
-        return '{{%' . str_replace($this->db->tablePrefix, '', $table->name) . '}}';
+        return '{{%'.str_replace($this->db->tablePrefix, '', $table->name).'}}';
     }
 
 
@@ -52,7 +52,7 @@ 
     {
 
         
-        return '$this->batchInsert("{{%test}}", ' . $rows . ', ' . $columns . ');';
+        return '$this->batchInsert("{{%test}}", '.$rows.', '.$columns.');';
     }
 
     /**
@@ -76,9 +76,9 @@ 
         foreach ($data as $row) {
             $rows = '';
             foreach ($row as $value) {
-                $rows .= "'" . addslashes($value) . "',";
+                $rows .= "'".addslashes($value)."',";
             }
-            self::$rows .= "\n\t\t\t" . self::dataFormat($rows) . ",";
+            self::$rows .= "\n\t\t\t".self::dataFormat($rows).",";
         }
         if (!empty(self::$rows)) {
             return self::dataFormat(self::$rows);
@@ -96,7 +96,7 @@ 
         if (null !== $trim) {
             $data = rtrim($data, $trim);
         }
-        return self::$dataEncloser[0] . $data . self::$dataEncloser[1];
+        return self::$dataEncloser[0].$data.self::$dataEncloser[1];
     }
 
     /**
@@ -110,7 +110,7 @@ 
             $data = rtrim($data, $trim);
         }
 
-        return self::$columnEncloser[0] . rtrim($data, $trim) . self::$columnEncloser[1];
+        return self::$columnEncloser[0].rtrim($data, $trim).self::$columnEncloser[1];
     }
 
     /**

Braces +23 added lines, -25 removed lines

@@ -5,8 +5,7 @@ 
 /**
  * Table class
  */
-trait Formatter
-{
+trait Formatter {
 
     /**
      * @var array column enclosing literal
@@ -41,15 +40,13 @@ 
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
 
-    public function getTableName($table)
-    {
+    public function getTableName($table) {
         return '{{%' . str_replace($this->db->tablePrefix, '', $table->name) . '}}';
     }
 
 
     
-    public function prepareInsert($rows, $columns)
-    {
+    public function prepareInsert($rows, $columns) {
 
         
         return '$this->batchInsert("{{%test}}", ' . $rows . ', ' . $columns . ');';
@@ -60,8 +57,7 @@ 
      * @param string $data the column string|$trim the literal to trim
      * @return string
      */
-    public function prepareColumns($data, $trim = ',')
-    {
+    public function prepareColumns($data, $trim = ',') {
         return self::columnFormat($data, $trim);
     }
 
@@ -70,8 +66,7 @@ 
      * @param array $data the data array
      * @return string
      */
-    public function prepareData($data = [])
-    {
+    public function prepareData($data = []) {
         self::$rows = '';
         foreach ($data as $row) {
             $rows = '';
@@ -91,8 +86,7 @@ 
      * @param string $data the column string|$trim the literal to trim
      * @return string
      */
-    public function dataFormat($data, $trim = ',')
-    {
+    public function dataFormat($data, $trim = ',') {
         if (null !== $trim) {
             $data = rtrim($data, $trim);
         }
@@ -104,8 +98,7 @@ 
      * @param string $data the column string|$trim the literal to trim
      * @return string
      */
-    public function columnFormat($data, $trim = ',')
-    {
+    public function columnFormat($data, $trim = ',') {
         if (null !== $trim) {
             $data = rtrim($data, $trim);
         }
@@ -122,8 +115,7 @@ 
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
 
-    public function getColType($col)
-    {
+    public function getColType($col) {
 
         if ($col->isPrimaryKey && $col->autoIncrement) {
             return 'pk';
@@ -135,11 +127,14 @@ 
         }
         if ($col->defaultValue != null && 'timestamp' != $col->dbType) {
             $result .= " DEFAULT '{$col->defaultValue}'";
-        } elseif ($col->defaultValue == 'CURRENT_TIMESTAMP' && 'timestamp' == $col->dbType) {
+        }
+        elseif ($col->defaultValue == 'CURRENT_TIMESTAMP' && 'timestamp' == $col->dbType) {
             $result .= " DEFAULT {$col->defaultValue}";
-        } elseif ($col->defaultValue != null && 'timestamp' == $col->dbType) {
+        }
+        elseif ($col->defaultValue != null && 'timestamp' == $col->dbType) {
             $result .= " DEFAULT '{$col->defaultValue}'";
-        } elseif ($col->allowNull) {
+        }
+        elseif ($col->allowNull) {
             $result .= ' DEFAULT NULL';
         }
         return $result;
@@ -167,19 +162,22 @@ 
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
 
-    public function formatCol($col)
-    {
+    public function formatCol($col) {
         $decorator = [];
         if ($col->isPrimaryKey && $col->autoIncrement) {
             $decorator[] = 'primaryKey';
-        } elseif (in_array($col->type, self::$colTypes)) {
+        }
+        elseif (in_array($col->type, self::$colTypes)) {
             $decorator[] = "{$this->modifyColType($col->dbType)}";
-        } elseif ($col->type == 'decimal') {
+        }
+        elseif ($col->type == 'decimal') {
             $decorator[] = "{$col->dbType}";
-        } else {
+        }
+        else {
             if (!empty($col->size) && $col->size == 1 && $col->type != 'char') {
                 $column = "boolean";
-            } else {
+            }
+            else {
                 $column = "{$col->type}";
                 if (!empty($col->size)) {
                     $column .= "({$col->size})";

views/_createTable.php

Braces +3 added lines, -1 removed lines

@@ -13,9 +13,11 @@
     if (empty($field['decorators'])): ?>
             '<?= $field['property'] ?>',
 
-<?php else: ?>
+<?php else {
+    : ?>
             <?= "'{$field['property']}' => \$this->{$field['decorators']}" ?>,
 <?php endif;
+}
 
 endforeach; ?>
 

console/controllers/MigrationController.php

Spacing +19 added lines, -19 removed lines

@@ -89,7 +89,7 @@ 
                 throw new Exception("The 'db' option must refer to the application component ID of a DB connection.");
             }
 
-            $path = (string)Yii::getAlias($this->migrationPath);
+            $path = (string) Yii::getAlias($this->migrationPath);
 
 
             if (!is_dir($path)) {
@@ -184,7 +184,7 @@ 
      */
     protected function getCreateTableSql($table)
     {
-        $row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteTableName($table->fullName))->queryOne();
+        $row = $this->db->createCommand('SHOW CREATE TABLE '.$this->quoteTableName($table->fullName))->queryOne();
         if (isset($row['Create Table'])) {
             $sql = $row['Create Table'];
         } else {
@@ -207,7 +207,7 @@ 
      */
     public function actionUpData($limit = 0)
     {
-        $this->migrationPath .= DIRECTORY_SEPARATOR . $this->dataMigrationFolder;
+        $this->migrationPath .= DIRECTORY_SEPARATOR.$this->dataMigrationFolder;
         return parent::actionUp($limit);
     }
 
@@ -222,11 +222,11 @@ 
     public function actionTable(array $tables)
     {
 
-        if ($this->confirm('Create the migration ' . "?")) {
+        if ($this->confirm('Create the migration '."?")) {
 
             foreach ($tables as $key => $tableName) {
 
-                $this->class = 'create_table_' . $tableName;
+                $this->class = 'create_table_'.$tableName;
 
                 try {
 
@@ -251,7 +251,7 @@ 
                 $this->table = $this->getTableName($table);
 
                 foreach ($table->columns as $col) {
-                    $up .= "\t\t\t" . '\'' . $col->name . '\'=>"' . $this->getColType($col) . '",' . "\n";
+                    $up .= "\t\t\t".'\''.$col->name.'\'=>"'.$this->getColType($col).'",'."\n";
                     if ($col->isPrimaryKey) {
                         // Add column to composite primary key array
                         $compositePrimaryKeyCols[] = $col->name;
@@ -260,7 +260,7 @@ 
 
                 $ukeys = $this->db->schema->findUniqueIndexes($table);
                 if (!empty($ukeys)) {
-                    $indexArr =[];
+                    $indexArr = [];
                     foreach ($ukeys as $key => $value) {
                         $indexKey = $key;
                         foreach ($value as $id => $field) {
@@ -268,15 +268,15 @@ 
                         }
                     }
                     $indexStr = implode(',', $indexArr);
-                    $up .= "\t\t" . '$this->createIndex(\'idx_' . $indexKey . "', '" . $this->getTableName($table) . "', '$indexStr', TRUE);\n";
+                    $up .= "\t\t".'$this->createIndex(\'idx_'.$indexKey."', '".$this->getTableName($table)."', '$indexStr', TRUE);\n";
 
                 }
 
                 if (!empty($table->foreignKeys)):
 
                     foreach ($table->foreignKeys as $fkName => $fk) {
-                        $addForeignKeys .= "\t\t" . '$this->addForeignKey("' . $fkName . '", "' . $table->name . '", "' . $fk['column'] . '","' . $fk['table'] . '","' . $fk['ref_column'] . '", "' . $fk['delete'] . '", "' . $fk['update'] . '");' . "\n";
-                        $dropForeignKeys .= '$this->dropForeignKey(' . "'$fkName', '$table->name');";
+                        $addForeignKeys .= "\t\t".'$this->addForeignKey("'.$fkName.'", "'.$table->name.'", "'.$fk['column'].'","'.$fk['table'].'","'.$fk['ref_column'].'", "'.$fk['delete'].'", "'.$fk['update'].'");'."\n";
+                        $dropForeignKeys .= '$this->dropForeignKey('."'$fkName', '$table->name');";
                     }
 
                 endif;
@@ -285,7 +285,7 @@ 
 
                 $fields = $this->parseFields();
 
-                $this->prepareFile(['up' => '', 'down' => '', 'foreignKeys' => $table->foreignKeys, 'fields' => $fields]) . "\n\n";
+                $this->prepareFile(['up' => '', 'down' => '', 'foreignKeys' => $table->foreignKeys, 'fields' => $fields])."\n\n";
 
             }
 
@@ -301,11 +301,11 @@ 
     public function actionData(array $tables)
     {
 
-        if ($this->confirm('Create the migration ' . "?", true)) {
+        if ($this->confirm('Create the migration '."?", true)) {
             foreach ($tables as $key => $args) {
 
                 $table              = $args;
-                $this->class        = 'insert_data_into_' . $table;
+                $this->class        = 'insert_data_into_'.$table;
                 $this->table        = $table;
                 $this->templateFile = '@tmukherjee13/migration/views/dataTemplate.php';
 
@@ -333,7 +333,7 @@ 
 
                     $pcolumns = '';
                     foreach ($columns->columns as $column) {
-                        $pcolumns .= "'" . $column->name . "',";
+                        $pcolumns .= "'".$column->name."',";
                     }
                     foreach ($data as $row) {
                         array_push($prepared_data, $row);
@@ -363,7 +363,7 @@ 
     {
 
         $schema      = $args;
-        $this->class = 'dump_database_' . $schema;
+        $this->class = 'dump_database_'.$schema;
 
         // $tables = $this->db->schema->getTableNames($schema);
 
@@ -378,7 +378,7 @@ 
         $generateTables  = [];
 
         foreach ($tables as $table) {
-            if ($table->name === $this->db->tablePrefix . $this->migrationTable) {
+            if ($table->name === $this->db->tablePrefix.$this->migrationTable) {
                 continue;
             }
             $generateTables[] = $table->name;
@@ -390,7 +390,7 @@ 
 
     public function getFileName()
     {
-        return 'm' . gmdate('ymd_His') . '_' . $this->class;
+        return 'm'.gmdate('ymd_His').'_'.$this->class;
     }
 
     public function setFileName()
@@ -401,9 +401,9 @@ 
     public function prepareFile($data)
     {
         if ($this->useDataMigrationFolder) {
-            FileHelper::createDirectory($this->migrationPath . DIRECTORY_SEPARATOR . $this->dataMigrationFolder);
+            FileHelper::createDirectory($this->migrationPath.DIRECTORY_SEPARATOR.$this->dataMigrationFolder);
         }
-        $file = $this->migrationPath . DIRECTORY_SEPARATOR . ($this->useDataMigrationFolder ? $this->dataMigrationFolder . DIRECTORY_SEPARATOR : null) . $this->getFileName() . '.php';
+        $file = $this->migrationPath.DIRECTORY_SEPARATOR.($this->useDataMigrationFolder ? $this->dataMigrationFolder.DIRECTORY_SEPARATOR : null).$this->getFileName().'.php';
         try {
 
             $data['table']     = $this->table;

Braces +21 added lines, -36 removed lines

@@ -10,8 +10,7 @@ 
 use yii\helpers\Console;
 use yii\helpers\FileHelper;
 
-class MigrationController extends MigrateController
-{
+class MigrationController extends MigrateController {
     use \tmukherjee13\migration\console\components\Formatter;
 
     /**
@@ -70,16 +69,14 @@ 
     /**
      * @inheritdoc
      */
-    public function options($actionID)
-    {
+    public function options($actionID) {
         return array_merge(parent::options($actionID), ['migrationTable', 'db']);
     }
 
     /**
      * @inheritdoc
      */
-    public function beforeAction($action)
-    {
+    public function beforeAction($action) {
 
         if (parent::beforeAction($action)) {
             if (is_string($this->db)) {
@@ -113,8 +110,7 @@ 
      * Collects the foreign key column details for the given table.
      * @param TableSchema $table the table metadata
      */
-    protected function findConstraints($table)
-    {
+    protected function findConstraints($table) {
         $sql = <<<SQL
             SELECT
                 kcu.constraint_name,
@@ -182,20 +178,19 @@ 
      * @param TableSchema $table the table metadata
      * @return string $sql the result of 'SHOW CREATE TABLE'
      */
-    protected function getCreateTableSql($table)
-    {
+    protected function getCreateTableSql($table) {
         $row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteTableName($table->fullName))->queryOne();
         if (isset($row['Create Table'])) {
             $sql = $row['Create Table'];
-        } else {
+        }
+        else {
             $row = array_values($row);
             $sql = $row[1];
         }
         return $sql;
     }
 
-    public function quoteTableName($name)
-    {
+    public function quoteTableName($name) {
         return strpos($name, '`') !== false ? $name : "`$name`";
     }
 
@@ -205,8 +200,7 @@ 
      * @param int $limit
      * @return int
      */
-    public function actionUpData($limit = 0)
-    {
+    public function actionUpData($limit = 0) {
         $this->migrationPath .= DIRECTORY_SEPARATOR . $this->dataMigrationFolder;
         return parent::actionUp($limit);
     }
@@ -219,8 +213,7 @@ 
      * @author Tarun Mukherjee (https://github.com/tmukherjee13)
      */
 
-    public function actionTable(array $tables)
-    {
+    public function actionTable(array $tables) {
 
         if ($this->confirm('Create the migration ' . "?")) {
 
@@ -298,8 +291,7 @@ 
      * @param array $tables the list of tables
      * @return integer|null
      */
-    public function actionData(array $tables)
-    {
+    public function actionData(array $tables) {
 
         if ($this->confirm('Create the migration ' . "?", true)) {
             foreach ($tables as $key => $args) {
@@ -341,7 +333,8 @@ 
 
                     if (empty($prepared_data)) {
                         $this->stdout("\nTable '{$table->name}' doesn't contain any data.\n\n", Console::FG_RED);
-                    } else {
+                    }
+                    else {
                         $pcolumns = $this->prepareColumns($pcolumns);
                         $prows    = $this->prepareData($prepared_data);
 
@@ -359,8 +352,7 @@ 
      * @param string $args the schema name
      * @return integer
      */
-    public function actionSchema($args)
-    {
+    public function actionSchema($args) {
 
         $schema      = $args;
         $this->class = 'dump_database_' . $schema;
@@ -388,18 +380,15 @@ 
 
     }
 
-    public function getFileName()
-    {
+    public function getFileName() {
         return 'm' . gmdate('ymd_His') . '_' . $this->class;
     }
 
-    public function setFileName()
-    {
+    public function setFileName() {
         $this->fileName = $this->getFileName();
     }
 
-    public function prepareFile($data)
-    {
+    public function prepareFile($data) {
         if ($this->useDataMigrationFolder) {
             FileHelper::createDirectory($this->migrationPath . DIRECTORY_SEPARATOR . $this->dataMigrationFolder);
         }
@@ -422,8 +411,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function getMigrationHistory($limit)
-    {
+    protected function getMigrationHistory($limit) {
         if ($this->db->schema->getTableSchema($this->migrationTable, true) === null) {
             $this->createMigrationHistoryTable();
         }
@@ -443,8 +431,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function addMigrationHistory($version)
-    {
+    protected function addMigrationHistory($version) {
         $command = $this->db->createCommand();
         $command->insert($this->migrationTable, [
             'version'    => $version,
@@ -455,8 +442,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function removeMigrationHistory($version)
-    {
+    protected function removeMigrationHistory($version) {
         $command = $this->db->createCommand();
         $command->delete($this->migrationTable, [
             'version' => $version,
@@ -466,8 +452,7 @@ 
     /**
      * @inheritdoc
      */
-    protected function parseFields()
-    {
+    protected function parseFields() {
         $fields = [];
 
         foreach ($this->fields as $column => $schema) {