Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable30] fix(migration): Correctly sort migrations by version number #47588

Merged
merged 1 commit into from
Aug 28, 2024
Merged

[stable30] fix(migration): Correctly sort migrations by version number #47588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions lib/private/DB/MigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private function createMigrationTable(): bool {
/**
* Returns all versions which have already been applied
*
* @return string[]
* @return list<string>
* @codeCoverageIgnore - no need to test this
*/
public function getMigratedVersions() {
Expand All @@ -174,6 +174,8 @@ public function getMigratedVersions() {
$rows = $result->fetchAll(\PDO::FETCH_COLUMN);
$result->closeCursor();

usort($rows, $this->sortMigrations(...));

return $rows;
}

Expand All @@ -183,7 +185,23 @@ public function getMigratedVersions() {
*/
public function getAvailableVersions(): array {
$this->ensureMigrationsAreLoaded();
return array_map('strval', array_keys($this->migrations));
$versions = array_map('strval', array_keys($this->migrations));
usort($versions, $this->sortMigrations(...));
return $versions;
}

protected function sortMigrations(string $a, string $b): int {
preg_match('/(\d+)Date(\d+)/', basename($a), $matchA);
preg_match('/(\d+)Date(\d+)/', basename($b), $matchB);
if (!empty($matchA) && !empty($matchB)) {
$versionA = (int)$matchA[1];
$versionB = (int)$matchB[1];
if ($versionA !== $versionB) {
return ($versionA < $versionB) ? -1 : 1;
}
return ($matchA[2] < $matchB[2]) ? -1 : 1;
}
return (basename($a) < basename($b)) ? -1 : 1;
}

/**
Expand All @@ -204,17 +222,7 @@ protected function findMigrations(): array {
\RegexIterator::GET_MATCH);

$files = array_keys(iterator_to_array($iterator));
uasort($files, function ($a, $b) {
preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
if (!empty($matchA) && !empty($matchB)) {
if ($matchA[1] !== $matchB[1]) {
return ($matchA[1] < $matchB[1]) ? -1 : 1;
}
return ($matchA[2] < $matchB[2]) ? -1 : 1;
}
return (basename($a) < basename($b)) ? -1 : 1;
});
usort($files, $this->sortMigrations(...));

$migrations = [];

Expand Down
Loading