Merge pull request #11 from nikolajlovenhardt/1.0

Fixed issue with migrate when there are non-existing previously executed migrations in db

Author: patrickbrouwers

src/Console/MigrateCommand.php

@@ -56,12 +56,16 @@ public function fire(ConfigurationProvider $provider, Migrator $migrator)
                 $configuration,
                 $this->argument('version')
             );
-        } catch (ExecutedUnavailableMigrationsException $e) {
-            $this->handleExecutedUnavailableMigrationsException($e, $configuration);
         } catch (MigrationVersionException $e) {
             $this->error($e->getMessage());
         }
 
+        try {
+            $migration->checkIfNotExecutedUnavailableMigrations();
+        } catch (ExecutedUnavailableMigrationsException $e) {
+            $this->handleExecutedUnavailableMigrationsException($e, $configuration);
+        }
+
         if ($path = $this->option('write-sql')) {
             $migrator->migrateToFile($migration, $path);
         } else {

src/Migration.php

@@ -35,8 +35,6 @@ public function __construct(Configuration $configuration, $version = 'latest')
         $this->configuration = $configuration;
         $this->makeMigration($configuration);
         $this->setVersion($configuration, $version);
-
-        $this->checkIfNotExecutedUnavailableMigrations($configuration);
     }
 
     /**
@@ -49,23 +47,6 @@ protected function makeMigration(Configuration $configuration)
         return $this->migration = new DBALMigration($configuration);
     }
 
-    /**
-     * @param Configuration $configuration
-     *
-     * @throws ExecutedUnavailableMigrationsException
-     */
-    protected function checkIfNotExecutedUnavailableMigrations(Configuration $configuration)
-    {
-        $executedUnavailableMigrations = array_diff(
-            $configuration->getMigratedVersions(),
-            $configuration->getAvailableVersions()
-        );
-
-        if (count($executedUnavailableMigrations) > 0) {
-            throw new ExecutedUnavailableMigrationsException($executedUnavailableMigrations);
-        }
-    }
-
     /**
      * @return DBALMigration
      */
@@ -96,6 +77,23 @@ protected function setVersion(Configuration $configuration, $versionAlias)
         $this->version = $version;
     }
 
+    /**
+     * @throws ExecutedUnavailableMigrationsException
+     */
+    public function checkIfNotExecutedUnavailableMigrations()
+    {
+        $configuration = $this->configuration;
+
+        $executedUnavailableMigrations = array_diff(
+            $configuration->getMigratedVersions(),
+            $configuration->getAvailableVersions()
+        );
+
+        if (count($executedUnavailableMigrations) > 0) {
+            throw new ExecutedUnavailableMigrationsException($executedUnavailableMigrations);
+        }
+    }
+
     /**
      * @return string|null
      */

tests/MigrationTest.php

@@ -58,6 +58,8 @@ public function test_throw_exception_when_executed_unavailable_migrations()
             $this->configuration,
             'latest'
         );
+
+        $migration->checkIfNotExecutedUnavailableMigrations();
     }
 
     public function test_throw_exception_when_no_version()