Refactor Migrations and Migration classes

phalcon · Nov 24, 2019 · 9603ab7 · 9603ab7
1 parent 24a62fa
commit 9603ab7
Show file tree

Hide file tree

Showing 2 changed files with 148 additions and 183 deletions.
diff --git a/src/Migrations.php b/src/Migrations.php
@@ -129,7 +129,7 @@ public static function generate(array $options)
         }
 
         ModelMigration::setup($optionStack->getOption('config')->database, $optionStack->getOption('verbose'));
-        ModelMigration::setSkipAutoIncrement($optionStack->getOption('noAutoIncrement'));
+        ModelMigration::setSkipAutoIncrement((bool)$optionStack->getOption('noAutoIncrement'));
         ModelMigration::setMigrationPath($migrationsDir);
 
         $wasMigrated = false;
@@ -354,7 +354,7 @@ public static function run(array $options)
                         continue;
                     }
 
-                    ModelMigration::migrate($initialVersion, $versionItem, $fileInfo->getBasename('.php'));
+                    ModelMigration::migrate($fileInfo->getBasename('.php'), $initialVersion, $versionItem);
                 }
             } else {
                 if (!empty($prefix)) {
@@ -363,7 +363,7 @@ public static function run(array $options)
 
                 $tables = explode(',', $optionStack->getOption('tableName'));
                 foreach ($tables as $tableName) {
-                    ModelMigration::migrate($initialVersion, $versionItem, $tableName);
+                    ModelMigration::migrate($tableName, $initialVersion, $versionItem);
                 }
             }