upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-04 14:24:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #47588 from nextcloud/backport/47515/stable30

Browse source 
[stable30] fix(migration): Correctly sort migrations by version number
This commit is contained in:
Andy Scherzinger 2024-08-28 22:08:16 +02:00 committed by GitHub
commit d854ed5dfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/private/DB/MigrationService.php
View file

@ -158,7 +158,7 @@ class MigrationService {
/**
* Returns all versions which have already been applied
*
* @return string[]
* @return list<string>
* @codeCoverageIgnore - no need to test this
*/
public function getMigratedVersions() {
@ -174,6 +174,8 @@ class MigrationService {
$rows = $result->fetchAll(\PDO::FETCH_COLUMN);
$result->closeCursor();
usort($rows, $this->sortMigrations(...));
return $rows;
}
@ -183,7 +185,23 @@ class MigrationService {
*/
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;
}
/**
@ -204,17 +222,7 @@ class MigrationService {
\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 = [];