Manually sort migrations found instead of relying on the OS to do so …

…for us. Fixes #1666
codeigniter4 · Feb 19, 2019 · e557f41 · e557f41
1 parent 20527d9
commit e557f41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -459,6 +459,8 @@ public function findMigrations()
 			}
 		}
 
+		ksort($migrations);
+
 		return $migrations;
 	}
 

diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -181,8 +181,8 @@ public function testFindMigrationsSuccessTimestamp()
 		$migrations = $runner->findMigrations();
 
 		$this->assertCount(2, $migrations);
-		$this->assertEquals($mig1, array_shift($migrations));
 		$this->assertEquals($mig2, array_shift($migrations));
+		$this->assertEquals($mig1, array_shift($migrations));
 	}
 
 	public function testFindMigrationsSuccessOrder()
@@ -211,8 +211,8 @@ public function testFindMigrationsSuccessOrder()
 
 		$migrations = $runner->findMigrations();
 
-		$this->assertEquals($mig1, array_shift($migrations));
 		$this->assertEquals($mig2, array_shift($migrations));
+		$this->assertEquals($mig1, array_shift($migrations));
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -459,6 +459,8 @@ public function findMigrations() @@
     			}
     		}
+    		ksort($migrations);
     		return $migrations;
     	}
@@ Expand Down @@