Merge pull request #149 from PaulMcRoar/master

davedevelopment · web-flow · commit feb66c90b0c8 · 2020-07-29T14:10:37.000+01:00
API migrate up issue resolution
diff --git a/src/Phpmig/Api/PhpmigApplication.php b/src/Phpmig/Api/PhpmigApplication.php
@@ -28,6 +28,7 @@ class PhpmigApplication
     protected $container;
     protected $output;
     protected $migrations;
+    protected $adapter;
     
     public function __construct(\ArrayAccess $container, OutputInterface $output)
     {
@@ -50,6 +51,7 @@ public function __construct(\ArrayAccess $container, OutputInterface $output)
         }
         
         $this->migrations = array_unique($migrations);
+        $this->adapter = $container['phpmig.adapter'];
     }
     
     /**
@@ -100,34 +102,63 @@ public function down($version = 0)
      */
     public function getMigrations($from, $to = null)
     {
-        $migrations = array();
-        
-        if ($to > $from || $to === null) {
-            ksort($this->migrations);
-        } else {
-            krsort($this->migrations);
+        $to_run = array();
+
+        $migrations = $this->migrations;
+        $versions   = $this->adapter->fetchAll();
+
+        sort($versions);
+
+        $direction = 'up';
+        if($to !== null ){
+            $direction = $to > $from ? 'up' : 'down';            
         }
-        
-        foreach ($this->migrations as $path) {
-            preg_match('/^[0-9]+/', basename($path), $matches);
-            if (!array_key_exists(0, $matches)) {
-                continue;
+
+
+        if ($direction == 'down') {
+            rsort($migrations);
+
+            foreach($migrations as $path) {
+                preg_match('/^[0-9]+/', basename($path), $matches);
+                if (!array_key_exists(0, $matches)) {
+                    continue;
+                }
+                
+                $version = $matches[0];
+
+                if ($version > $from) {
+                    continue;
+                }
+                if ($version <= $to) {
+                    continue;
+                }
+
+                if (in_array($version, $versions)) {
+                    $to_run[] = $path;
+                }
             }
-            
-            $version = $matches[0];
-    
-            // up
-            if ($to > $from || $to === null) {
-                if ($version > $from && ($version <= $to || $to === null)) {
-                    $migrations[] = $path;
+        }else{
+            sort($migrations);
+            foreach($migrations as $path) {
+                preg_match('/^[0-9]+/', basename($path), $matches);
+                if (!array_key_exists(0, $matches)) {
+                    continue;
+                }
+                
+                $version = $matches[0];
+
+                if ($to !== null && ($version > $to)) {
+                    continue;
+                }
+
+                if (!in_array($version, $versions)) {
+                    $to_run[] = $path;
                 }
-            // down
-            } elseif ($to < $from && $version > $to && $version <= $from) {
-                $migrations[] = $path;
             }
+
         }
-        
-        return $this->loadMigrations($migrations);
+
+        return $this->loadMigrations($to_run);
     }
     
     /**
diff --git a/tests/Phpmig/Api/PhpmigApplicationTest.php b/tests/Phpmig/Api/PhpmigApplicationTest.php
@@ -104,17 +104,17 @@ public function testGetMigrations()
         );
         
         // up
-        $this->assertCount(3, $app->getMigrations(0, $this->next_version));
-        $this->assertCount(3, $app->getMigrations(0, null));
+        $this->assertCount(2, $app->getMigrations(0, $this->next_version));
+        $this->assertCount(2, $app->getMigrations(0, null));
         $this->assertCount(2, $app->getMigrations($this->prev_version, $this->next_version));
-        $this->assertCount(1, $app->getMigrations($this->current_version, $this->next_version));
+        $this->assertCount(2, $app->getMigrations($this->current_version, $this->next_version));
         $this->assertCount(0, $app->getMigrations($this->next_version, $this->next_version));
         
         // down
-        $this->assertCount(1, $app->getMigrations($this->next_version, $this->current_version));
+        $this->assertCount(0, $app->getMigrations($this->next_version, $this->current_version));
         $this->assertCount(1, $app->getMigrations($this->current_version, $this->prev_version));
-        $this->assertCount(2, $app->getMigrations($this->next_version, $this->prev_version));
-        $this->assertCount(3, $app->getMigrations($this->next_version, 0));
+        $this->assertCount(1, $app->getMigrations($this->next_version, $this->prev_version));
+        $this->assertCount(1, $app->getMigrations($this->next_version, 0));
     }
     
     /**
