From ca7a7a5c8541a86adfb969edc428a68403d91594 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 17 Feb 2021 15:26:06 +0100 Subject: [PATCH] add missing changes from backport source Signed-off-by: Arthur Schiwon --- lib/private/Repair.php | 3 ++- tests/lib/Repair/RepairDavSharesTest.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 1b034b3be5..cc477465a8 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -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; diff --git a/tests/lib/Repair/RepairDavSharesTest.php b/tests/lib/Repair/RepairDavSharesTest.php index f937a01f83..199a9a101e 100644 --- a/tests/lib/Repair/RepairDavSharesTest.php +++ b/tests/lib/Repair/RepairDavSharesTest.php @@ -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))