diff options
author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2021-01-08 14:58:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 14:58:43 +0100 |
commit | 81302f78e5cea60dc9064be8ed979d523ff84e18 (patch) | |
tree | 76e8d025c3003e718cf5e04105b782ba8aaa4891 /lib/private/Setup/AbstractDatabase.php | |
parent | aeb32e1bc8f50d641e093589cc2f8c90da166768 (diff) | |
parent | 250f76a59cfc865e2a6bd36b690abeed3b529490 (diff) | |
download | nextcloud-server-81302f78e5cea60dc9064be8ed979d523ff84e18.tar.gz nextcloud-server-81302f78e5cea60dc9064be8ed979d523ff84e18.zip |
Merge pull request #24948 from nextcloud/dependabot/composer/doctrine/dbal-3.0.0
Bump doctrine/dbal from 2.12.0 to 3.0.0
Diffstat (limited to 'lib/private/Setup/AbstractDatabase.php')
-rw-r--r-- | lib/private/Setup/AbstractDatabase.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 8a9aed09f1b..e0761db3070 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -29,6 +29,7 @@ namespace OC\Setup; +use OC\DB\Connection; use OC\DB\ConnectionFactory; use OC\DB\MigrationService; use OC\SystemConfig; @@ -108,7 +109,7 @@ abstract class AbstractDatabase { * @param array $configOverwrite * @return \OC\DB\Connection */ - protected function connect(array $configOverwrite = []) { + protected function connect(array $configOverwrite = []): Connection { $connectionParams = [ 'host' => $this->dbHost, 'user' => $this->dbUser, @@ -149,7 +150,7 @@ abstract class AbstractDatabase { if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) { return; } - $ms = new MigrationService('core', \OC::$server->getDatabaseConnection()); + $ms = new MigrationService('core', \OC::$server->get(Connection::class)); $ms->migrate('latest', true); } } |