diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-01-03 15:28:31 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-01-08 11:45:19 +0100 |
| commit | 8b64e92b9262d2a2eec6345685ce421050f95c66 (patch) | |
| tree | dd51490b8a184b2643414d11867a9fa450aa5065 /apps/settings/lib | |
| parent | 84e6e9f7cf19207041925eaa237d24e1c12c2c2d (diff) | |
| download | nextcloud-server-8b64e92b9262d2a2eec6345685ce421050f95c66.tar.gz nextcloud-server-8b64e92b9262d2a2eec6345685ce421050f95c66.zip | |
Bump doctrine/dbal from 2.12.0 to 3.0.0
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/settings/lib')
| -rw-r--r-- | apps/settings/lib/Controller/CheckSetupController.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 5b004d753e2..6acd970c40e 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -44,8 +44,9 @@ namespace OCA\Settings\Controller; use bantu\IniGetWrapper\IniGetWrapper; use DirectoryIterator; -use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Exception; use Doctrine\DBAL\Platforms\SqlitePlatform; +use Doctrine\DBAL\TransactionIsolationLevel; use Doctrine\DBAL\Types\Types; use GuzzleHttp\Exception\ClientException; use OC; @@ -94,7 +95,7 @@ class CheckSetupController extends Controller { private $logger; /** @var EventDispatcherInterface */ private $dispatcher; - /** @var IDBConnection|Connection */ + /** @var Connection */ private $db; /** @var ILockingProvider */ private $lockingProvider; @@ -116,7 +117,7 @@ class CheckSetupController extends Controller { Checker $checker, ILogger $logger, EventDispatcherInterface $dispatcher, - IDBConnection $db, + Connection $db, ILockingProvider $lockingProvider, IDateTimeFormatter $dateTimeFormatter, MemoryInfo $memoryInfo, @@ -492,8 +493,8 @@ Raw output return true; } - return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED; - } catch (DBALException $e) { + return $this->db->getTransactionIsolation() === TransactionIsolationLevel::READ_COMMITTED; + } catch (Exception $e) { // ignore } |