From 8f499b9c8af15cbb9315a7f4cbdc3f97577f7863 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 ca523bf322..a54f588958 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -157,6 +157,7 @@ class Repair implements IOutput { new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)), new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)), \OC::$server->query(ResetGeneratedAvatarFlag::class), + \OC::$server->get(RepairDavShares::class) ]; } @@ -185,7 +186,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))