Ensure closing of connection when using the ConnectionManager::execut…

…eAndClose() method.
mako-framework · Nov 24, 2023 · 0323bd0 · 0323bd0
1 parent c91ad3f
commit 0323bd0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 9.1.5 <small>(2023-11-24)</small>
+
+#### Bugfixes
+
+* Ensure closing of connection when using the `ConnectionManager::executeAndClose()` method.
+
+--------------------------------------------------------
+
 ### 9.1.4 <small>(2023-11-16)</small>
 
 #### Bugfixes

diff --git a/src/mako/Mako.php b/src/mako/Mako.php
@@ -17,7 +17,7 @@ class Mako
 	 *
 	 * @var string
 	 */
-	public const VERSION = '9.1.4';
+	public const VERSION = '9.1.5';
 
 	/**
 	 * Mako major version.
@@ -38,5 +38,5 @@ class Mako
 	 *
 	 * @var int
 	 */
-	public const VERSION_PATCH = 4;
+	public const VERSION_PATCH = 5;
 }
diff --git a/src/mako/common/ConnectionManager.php b/src/mako/common/ConnectionManager.php
@@ -86,11 +86,12 @@ public function close(?string $connection = null): void
 	 */
 	public function executeAndClose(Closure $closure, ?string $connection = null): mixed
 	{
-		$returnValue = $closure($this->getConnection($connection));
-
-		$this->close($connection);
-
-		return $returnValue;
+		try {
+			return $closure($this->getConnection($connection));
+		}
+		finally {
+			$this->close($connection);
+		}
 	}
 
 	/**