Reset connection when closing it + cleanup and hardening

Author: freost

src/mako/database/connections/Connection.php

@@ -145,79 +145,129 @@ public function __clone()
 	{
 		$this->name = "{$this->name}_clone";
 
-		$this->log = [];
+		$this->clearLog();
 
 		$this->transactionNestingLevel = 0;
 
 		$this->pdo = $this->connect();
 	}
 
 	/**
-	 * Closes the database connection.
+	 * Returns the connection name.
 	 */
-	public function close(): void
+	public function getName(): string
 	{
-		$this->pdo = null;
+		return $this->name;
+	}
 
-		$this->transactionNestingLevel = 0;
+	/**
+	 * Returns the PDO instance or null if the connection has been closed.
+	 */
+	public function getPDO(): ?PDO
+	{
+		return $this->pdo;
 	}
 
 	/**
-	 * Does the connection support transactional DDL?
+	 * Enables the query log.
 	 */
-	public function supportsTransactionalDDL(): bool
+	public function enableLog(): void
 	{
-		return static::SUPPORTS_TRANSACTIONAL_DDL;
+		$this->enableLog = true;
 	}
 
 	/**
-	 * Returns the connection name.
+	 * Disables the query log.
 	 */
-	public function getName(): string
+	public function disableLog(): void
 	{
-		return $this->name;
+		$this->enableLog = false;
 	}
 
 	/**
-	 * Returns a query builder helper instance.
+	 * Clears the query log.
 	 */
-	public function getQueryBuilderHelper(): HelperInterface
+	public function clearLog(): void
 	{
-		static $queryBuilderHelper = [];
+		$this->log = [];
+	}
 
-		return $queryBuilderHelper[static::class] ?? ($queryBuilderHelper[static::class] = new $this->queryBuilderHelper);
+	/**
+	 * Returns the query log.
+	 */
+	public function getLog(): array
+	{
+		return $this->log;
 	}
 
 	/**
-	 * Returns a query compiler instance.
+	 * Resets the connection.
 	 */
-	public function getQueryCompiler(Query $query): Compiler
+	public function reset(): void
 	{
-		return new ($this->queryCompiler)($query);
+		if ($this->pdo === null) {
+			return;
+		}
+
+		try {
+			// Rollback any open transactions
+
+			while ($this->transactionNestingLevel > 0) {
+				$this->rollBackTransaction();
+			}
+
+			// Rollback potential transaction created directly on the PDO instance
+
+			if ($this->pdo->inTransaction()) {
+				$this->pdo->rollBack();
+			}
+		}
+		finally {
+			$this->clearLog();
+		}
 	}
 
 	/**
-	 * Returns the PDO instance or null if the connection has been closed.
+	 * Closes the database connection.
 	 */
-	public function getPDO(): ?PDO
+	public function close(): void
 	{
-		return $this->pdo;
+		try {
+			$this->reset();
+		}
+		catch (Throwable) {
+			// The connection is being closed so we don't care if the reset fails
+		}
+
+		$this->pdo = null;
+
+		$this->transactionNestingLevel = 0;
 	}
 
 	/**
-	 * Enables the query log.
+	 * Does the connection support transactional DDL?
 	 */
-	public function enableLog(): void
+	public function supportsTransactionalDDL(): bool
 	{
-		$this->enableLog = true;
+		return static::SUPPORTS_TRANSACTIONAL_DDL;
 	}
 
 	/**
-	 * Disables the query log.
+	 * Returns a query builder helper instance.
 	 */
-	public function disableLog(): void
+	public function getQueryBuilderHelper(): HelperInterface
 	{
-		$this->enableLog = false;
+		static $queryBuilderHelper = [];
+
+		return $queryBuilderHelper[static::class] ?? ($queryBuilderHelper[static::class] = new $this->queryBuilderHelper);
+	}
+
+	/**
+	 * Returns a query compiler instance.
+	 */
+	public function getQueryCompiler(Query $query): Compiler
+	{
+		return new ($this->queryCompiler)($query);
 	}
 
 	/**
@@ -272,10 +322,14 @@ public function reconnect(): void
 	 */
 	public function isAlive(): bool
 	{
+		if ($this->pdo === null) {
+			return false;
+		}
+
 		try {
 			$this->pdo->query('SELECT 1');
 		}
-		catch (PDOException $e) {
+		catch (PDOException) {
 			return false;
 		}
 
@@ -320,22 +374,6 @@ protected function log(string $query, array $params, float $start): void
 		$this->log[] = ['query' => $query, 'time' => $time];
 	}
 
-	/**
-	 * Clears the query log.
-	 */
-	public function clearLog(): void
-	{
-		$this->log = [];
-	}
-
-	/**
-	 * Returns the query log for the connection.
-	 */
-	public function getLog(): array
-	{
-		return $this->log;
-	}
-
 	/**
 	 * Prepare query and params.
 	 */
@@ -667,7 +705,7 @@ public function getTransactionNestingLevel(): int
 	 */
 	public function inTransaction(): bool
 	{
-		return $this->pdo->inTransaction();
+		return $this->pdo?->inTransaction() ?? false;
 	}
 
 	/**
@@ -692,31 +730,4 @@ public function transaction(Closure $queries): mixed
 
 		return $returnValue;
 	}
-
-	/**
-	 * Resets the connection.
-	 */
-	public function reset(): void
-	{
-		if ($this->pdo === null) {
-			return;
-		}
-
-		try {
-			// Rollback any open transactions
-
-			while ($this->transactionNestingLevel > 0) {
-				$this->rollBackTransaction();
-			}
-
-			// Rollback potential transaction created directly on the PDO instance
-
-			if ($this->pdo->inTransaction()) {
-				$this->pdo->rollBack();
-			}
-		}
-		finally {
-			$this->clearLog();
-		}
-	}
 }