Dibi\Driver::disconnect() replaced with destructor (BC break)

dg · May 2, 2018 · 87c9f61 · 87c9f61
1 parent 3eb4390
commit 87c9f61
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 19 deletions.
diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
@@ -104,9 +104,7 @@ public function __construct($config, string $name = null)
 	 */
 	public function __destruct()
 	{
-		if ($this->connected && $this->driver->getResource()) {
-			$this->disconnect();
-		}
+		$this->disconnect();
 	}
 
 
@@ -148,7 +146,6 @@ final public function connect(): void
 	final public function disconnect(): void
 	{
 		if ($this->connected) {
-			$this->driver->disconnect();
 			$this->connected = false;
 		}
 	}

diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php
@@ -80,7 +80,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@ibase_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php
@@ -61,7 +61,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@mssql_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php
@@ -118,7 +118,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@mysqli_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php
@@ -68,7 +68,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@odbc_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php
@@ -80,7 +80,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@oci_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php
@@ -77,7 +77,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		$this->connection = null;
 	}

diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php
@@ -95,7 +95,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		@pg_close($this->connection); // @ - connection can be already disconnected
 	}

diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php
@@ -75,7 +75,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		$this->connection->close();
 	}

diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php
@@ -79,7 +79,7 @@ public function __construct(array &$config)
 	/**
 	 * Disconnects from a database.
 	 */
-	public function disconnect(): void
+	public function __destruct()
 	{
 		if ($this->connection) {
 			@sqlsrv_close($this->connection); // @ - connection can be already disconnected

diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php
@@ -25,12 +25,6 @@ interface IDataSource extends \Countable, \IteratorAggregate
  */
 interface Driver
 {
-	/**
-	 * Disconnects from a database.
-	 * @throws Exception
-	 */
-	function disconnect(): void;
-
 	/**
 	 * Internal: Executes the SQL query.
 	 * @throws DriverException