add missing changes from backport source

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · Feb 17, 2021 · ca7a7a5 · ca7a7a5
1 parent 7c449cd
commit ca7a7a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
@@ -183,6 +183,7 @@ public static function getRepairSteps() {
 			\OC::$server->query(EncryptionLegacyCipher::class),
 			\OC::$server->query(EncryptionMigration::class),
 			\OC::$server->get(ShippedDashboardEnable::class),
+			\OC::$server->get(RepairDavShares::class)
 		];
 	}
 
@@ -211,7 +212,7 @@ public static function getBeforeUpgradeRepairSteps() {
 			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
@@ -175,7 +175,7 @@ public function testRun() {
 				['updatedPrincipalUri', 'principals/groups/' . urlencode('family friends')],
 				['shareId', 7],
 				['updatedPrincipalUri', 'principals/groups/' . urlencode('Wants Repair')],
-				['shareId', 1],
+				['shareId', 1]
 			)
 			->willReturnSelf();
 		$updateMock->expects($this->exactly(2))