add missing changes from backport source

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 1b034b3be5e7ecf5142938726323177a8fb47d9e..cc477465a8e2f273db88509a2e3edbca14bebf5d 100644 (file)
--- 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 f937a01f83987b2b83b908860b12bbd862d4a657..199a9a101ea27b962592f67feaa5b992d29b0380 100644 (file)
--- 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))