diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php index 64104c1e28..5c5ac4959b 100644 --- a/lib/private/Repair/RepairDavShares.php +++ b/lib/private/Repair/RepairDavShares.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace OC\Repair; -use OCP\DB\Exception; +use Doctrine\DBAL\DBALException; use OCP\IConfig; use OCP\IDBConnection; use OCP\IGroupManager; @@ -112,7 +112,7 @@ class RepairDavShares implements IRepairStep { ->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 index 199a9a101e..ad18409a88 100644 --- a/tests/lib/Repair/RepairDavSharesTest.php +++ b/tests/lib/Repair/RepairDavSharesTest.php @@ -25,8 +25,8 @@ declare(strict_types=1); 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 @@ class RepairDavSharesTest extends TestCase { ], ]; - $shareResults = $this->createMock(IResult::class); + $shareResults = $this->createMock(Statement::class); $shareResults->expects($this->any()) ->method('fetch') ->willReturnCallback(function () use (&$shareResultData) {