add missing changes from backport source

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2021-02-17 15:26:06 +01:00
parent 7c449cd0ba
commit ca7a7a5c85
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 3 additions and 2 deletions

View File

@ -183,6 +183,7 @@ class Repair implements IOutput {
\OC::$server->query(EncryptionLegacyCipher::class),
\OC::$server->query(EncryptionMigration::class),
\OC::$server->get(ShippedDashboardEnable::class),
\OC::$server->get(RepairDavShares::class)
];
}
@ -211,7 +212,7 @@ class Repair implements IOutput {
new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
new SqliteAutoincrement($connection),
new SaveAccountsTableData($connection, $config),
new DropAccountTermsTable($connection)
new DropAccountTermsTable($connection),
];
return $steps;

View File

@ -175,7 +175,7 @@ class RepairDavSharesTest extends TestCase {
['updatedPrincipalUri', 'principals/groups/' . urlencode('family friends')],
['shareId', 7],
['updatedPrincipalUri', 'principals/groups/' . urlencode('Wants Repair')],
['shareId', 1],
['shareId', 1]
)
->willReturnSelf();
$updateMock->expects($this->exactly(2))