MySqliDriver::getResource() fixed access to resource being closed pri…

…or to the call in PHP 8 (#410)
dg · Dec 12, 2021 · 7b3a6e6 · 7b3a6e6
1 parent 170eaa5
commit 7b3a6e6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php
@@ -253,7 +253,11 @@ public function rollback(?string $savepoint = null): void
 	 */
 	public function getResource(): ?\mysqli
 	{
-		return @$this->connection->thread_id ? $this->connection : null;
+		try {
+			return @$this->connection->thread_id ? $this->connection : null;
+		} catch (\Throwable $e) {
+			return null;
+		}
 	}
 
 

diff --git a/tests/dibi/Connection.connect.phpt b/tests/dibi/Connection.connect.phpt
@@ -63,6 +63,15 @@ test('', function () use ($config) {
 });
 
 
+test('', function () use ($config) {
+	$conn = new Connection($config);
+	Assert::true($conn->isConnected());
+
+	$conn->__destruct();
+	Assert::false($conn->isConnected());
+});
+
+
 test('', function () use ($config) {
 	Assert::exception(function () use ($config) {
 		new Connection($config + ['onConnect' => '']);