compatibility to Nc 20

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

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php
@@ -25,7 +25,7 @@
 
 namespace OC\Repair;
 
-use OCP\DB\Exception;
+use Doctrine\DBAL\DBALException;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
@@ -112,7 +112,7 @@ protected function repairUnencodedGroupShares() {
 					->setParameter('shareId', $share['id'])
 					->execute();
 				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
-			} catch (Exception $e) {
+			} catch (DBALException $e) {
 				$logParameters['message'] = $e->getMessage();
 				$logParameters['exception'] = $e;
 				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);

diff --git a/tests/lib/Repair/RepairDavSharesTest.php b/tests/lib/Repair/RepairDavSharesTest.php
@@ -25,8 +25,8 @@
 
 namespace Test\Repair;
 
+use Doctrine\DBAL\Driver\Statement;
 use OC\Repair\RepairDavShares;
-use OCP\DB\IResult;
 use OCP\DB\QueryBuilder\IExpressionBuilder;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
@@ -130,7 +130,7 @@ public function testRun() {
 			],
 		];
 
-		$shareResults = $this->createMock(IResult::class);
+		$shareResults = $this->createMock(Statement::class);
 		$shareResults->expects($this->any())
 			->method('fetch')
 			->willReturnCallback(function () use (&$shareResultData) {