From b6c4f1e4bcf5363688d4233c896908fd6b20d2f8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 14 Mar 2020 20:32:16 +0100 Subject: [PATCH] fix phpstan --- DataStorage/Database/Connection/MysqlConnection.php | 1 - DataStorage/Database/Connection/PostgresConnection.php | 1 - DataStorage/Database/Connection/SQLiteConnection.php | 1 - DataStorage/Database/Connection/SqlServerConnection.php | 3 --- 4 files changed, 6 deletions(-) diff --git a/DataStorage/Database/Connection/MysqlConnection.php b/DataStorage/Database/Connection/MysqlConnection.php index c89f519b5..933062016 100644 --- a/DataStorage/Database/Connection/MysqlConnection.php +++ b/DataStorage/Database/Connection/MysqlConnection.php @@ -72,7 +72,6 @@ final class MysqlConnection extends ConnectionAbstract } $this->close(); - $this->prefix = $dbdata['prefix'] ?? ''; try { $this->con = new \PDO($this->dbdata['db'] . ':host=' . $this->dbdata['host'] . ':' . $this->dbdata['port'] . ';dbname=' . $this->dbdata['database'] . ';charset=utf8mb4', $this->dbdata['login'], $this->dbdata['password']); diff --git a/DataStorage/Database/Connection/PostgresConnection.php b/DataStorage/Database/Connection/PostgresConnection.php index ec36ee21c..aa4c7039a 100644 --- a/DataStorage/Database/Connection/PostgresConnection.php +++ b/DataStorage/Database/Connection/PostgresConnection.php @@ -72,7 +72,6 @@ final class PostgresConnection extends ConnectionAbstract } $this->close(); - $this->prefix = $dbdata['prefix'] ?? ''; try { $this->con = new \PDO($this->dbdata['db'] . ':host=' . $this->dbdata['host'] . ';port=' . $this->dbdata['port'] . ';dbname=' . $this->dbdata['database'], $this->dbdata['login'], $this->dbdata['password']); diff --git a/DataStorage/Database/Connection/SQLiteConnection.php b/DataStorage/Database/Connection/SQLiteConnection.php index 33c798bc5..6401edaa3 100644 --- a/DataStorage/Database/Connection/SQLiteConnection.php +++ b/DataStorage/Database/Connection/SQLiteConnection.php @@ -78,7 +78,6 @@ final class SQLiteConnection extends ConnectionAbstract } $this->close(); - $this->prefix = $dbdata['prefix'] ?? ''; try { $this->con = new \PDO($this->dbdata['db'] . ':' . $this->dbdata['database']); diff --git a/DataStorage/Database/Connection/SqlServerConnection.php b/DataStorage/Database/Connection/SqlServerConnection.php index a987008b0..bab314c42 100644 --- a/DataStorage/Database/Connection/SqlServerConnection.php +++ b/DataStorage/Database/Connection/SqlServerConnection.php @@ -62,8 +62,6 @@ final class SqlServerConnection extends ConnectionAbstract */ public function connect(array $dbdata = null) : void { - $this->close(); - $this->dbdata = $dbdata ?? $this->dbdata; if (!isset($this->dbdata['db'], $this->dbdata['host'], $this->dbdata['port'], $this->dbdata['database'], $this->dbdata['login'], $this->dbdata['password']) @@ -74,7 +72,6 @@ final class SqlServerConnection extends ConnectionAbstract } $this->close(); - $this->prefix = $dbdata['prefix'] ?? ''; try { $this->con = new \PDO('sqlsrv:Server=' . $this->dbdata['host'] . ',' . $this->dbdata['port'] . ';Database=' . $this->dbdata['database'] . ';ConnectionPooling=0', $this->dbdata['login'], $this->dbdata['password']);