diff options
| -rw-r--r-- | lib/private/DB/ConnectionFactory.php | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index 11b17795634..4926cdd95b9 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -76,16 +76,10 @@ class ConnectionFactory { ], ]; - /** @var SystemConfig */ - private $config; - /** - * ConnectionFactory constructor. - * - * @param SystemConfig $systemConfig - */ - public function __construct(SystemConfig $systemConfig) { - $this->config = $systemConfig; + public function __construct( + private SystemConfig $config + ) { if ($this->config->getValue('mysql.utf8mb4', false)) { $this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4'; } @@ -123,7 +117,7 @@ class ConnectionFactory { * @param array $additionalConnectionParams Additional connection parameters * @return \OC\DB\Connection */ - public function getConnection($type, $additionalConnectionParams) { + public function getConnection(string $type, array $additionalConnectionParams): Connection { $normalizedType = $this->normalizeType($type); $eventManager = new EventManager(); $eventManager->addEventSubscriber(new SetTransactionIsolationLevel()); @@ -136,20 +130,20 @@ class ConnectionFactory { case 'oci': $eventManager->addEventSubscriber(new OracleSessionInit); // the driverOptions are unused in dbal and need to be mapped to the parameters - if (isset($additionalConnectionParams['driverOptions'])) { - $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']); + if (isset($connectionParams['driverOptions'])) { + $connectionParams = array_merge($connectionParams, $connectionParams['driverOptions']); } - $host = $additionalConnectionParams['host']; - $port = $additionalConnectionParams['port'] ?? null; - $dbName = $additionalConnectionParams['dbname']; + $host = $connectionParams['host']; + $port = $connectionParams['port'] ?? null; + $dbName = $connectionParams['dbname']; // we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string if ($host === '') { - $additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name + $connectionParams['dbname'] = $dbName; // use dbname as easy connect name } else { - $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName; + $connectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName; } - unset($additionalConnectionParams['host']); + unset($connectionParams['host']); break; case 'pgsql': @@ -162,8 +156,8 @@ class ConnectionFactory { break; case 'sqlite3': - $journalMode = $additionalConnectionParams['sqlite.journal_mode']; - $additionalConnectionParams['platform'] = new OCSqlitePlatform(); + $journalMode = $connectionParams['sqlite.journal_mode']; + $connectionParams['platform'] = new OCSqlitePlatform(); $eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode)); break; } @@ -202,7 +196,7 @@ class ConnectionFactory { * @param string $configPrefix * @return array */ - public function createConnectionParams(string $configPrefix = '') { + public function createConnectionParams(string $configPrefix = '', array $additionalConnectionParams = []) { $type = $this->config->getValue('dbtype', 'sqlite'); $connectionParams = [ @@ -246,6 +240,7 @@ class ConnectionFactory { if ($this->config->getValue('dbpersistent', false)) { $connectionParams['persistent'] = true; } + $connectionParams = array_merge($connectionParams, $additionalConnectionParams); return $connectionParams; } |