- Fixed various problems with default parameters after last release

- Fixed `MySQL::dryRun` where PHP7-\Errors caused rollbacks on transactions
- Fixed `MySQL::transaction` where tries were not handled correctly

Author: rkrx

src/Builder/Insert.php

@@ -87,7 +87,7 @@ public function addOrUpdate($field, $value) {
 	 * @param string ...$_
 	 * @return $this
 	 */
-	public function addExpr($str, $_) {
+	public function addExpr($str, $_ = null) {
 		if(count(func_get_args()) > 1) {
 			$this->fields[] = func_get_args();
 		} else {
@@ -101,7 +101,7 @@ public function addExpr($str, $_) {
 	 * @param string ...$_
 	 * @return $this
 	 */
-	public function updateExpr($str, $_) {
+	public function updateExpr($str, $_ = null) {
 		if(count(func_get_args()) > 1) {
 			$this->update[] = func_get_args();
 		} else {

src/Builder/Traits/HavingBuilder.php

@@ -15,7 +15,7 @@ trait HavingBuilder {
 	 * @param mixed ...$_
 	 * @return $this
 	 */
-	public function having($expression, $_) {
+	public function having($expression, $_ = null) {
 		if($expression instanceof OptionalExpression) {
 			if($expression->isValid()) {
 				$this->having[] = [$expression->getExpression(), $expression->getValue()];

src/Builder/Traits/WhereBuilder.php

@@ -15,7 +15,7 @@ trait WhereBuilder {
 	 * @param mixed ...$_
 	 * @return $this
 	 */
-	public function where($expression, $_) {
+	public function where($expression, $_ = null) {
 		if($expression instanceof OptionalExpression) {
 			if($expression->isValid()) {
 				$this->where[] = [$expression->getExpression(), $expression->getValue()];

src/Builder/Update.php

@@ -62,7 +62,7 @@ public function setDefault($fieldName) {
 	 * @param string[] ...$_
 	 * @return $this
 	 */
-	public function setExpr($expr, $_) {
+	public function setExpr($expr, $_ = null) {
 		$this->fields[] = func_get_args();
 		return $this;
 	}

src/Database.php

@@ -1,28 +1,29 @@
 <?php
 namespace Kir\MySQL;
 
-use Kir\MySQL\Builder\Exception;
 use Kir\MySQL\Database\DatabaseStatement;
+use RuntimeException;
 
 interface Database {
 	/**
 	 * @param string $query
-	 * @throws Exception
 	 * @return DatabaseStatement
+	 * @throws RuntimeException
 	 */
 	public function query($query);
 
 	/**
 	 * @param string $query
-	 * @throws Exception
 	 * @return DatabaseStatement
+	 * @throws RuntimeException
 	 */
 	public function prepare($query);
 
 	/**
 	 * @param string $query
 	 * @param array $params
 	 * @return int
+	 * @throws RuntimeException
 	 */
 	public function exec($query, array $params = array());
 
@@ -81,31 +82,34 @@ public function delete();
 
 	/**
 	 * @return $this
+	 * @throws RuntimeException
 	 */
 	public function transactionStart();
 
 	/**
 	 * @return $this
+	 * @throws RuntimeException
 	 */
 	public function transactionCommit();
 
 	/**
 	 * @return $this
+	 * @throws RuntimeException
 	 */
 	public function transactionRollback();
 
 	/**
 	 * @param int|callable $tries
 	 * @param callable|null $callback
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 */
 	public function transaction($tries = 1, $callback = null);
 
 	/**
 	 * @param callable|null $callback
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 */
 	public function dryRun($callback = null);
 }

src/Databases/MySQL.php

@@ -3,6 +3,7 @@
 
 use PDO;
 use PDOException;
+use RuntimeException;
 use UnexpectedValueException;
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\Exception;
@@ -277,6 +278,7 @@ public function transactionRollback() {
 	 * @param callable|null $callback
 	 * @return mixed
 	 * @throws \Exception
+	 * @throws \Error
 	 * @throws null
 	 */
 	public function dryRun($callback = null) {
@@ -286,78 +288,92 @@ public function dryRun($callback = null) {
 			$this->transactionStart();
 			try {
 				$result = call_user_func($callback, $this);
+				$this->transactionRollback();
 			} catch (\Exception $e) {
-				$exception = $e;
-			}
-			$this->transactionRollback();
-			if($exception !== null) {
-				throw $exception;
+				$this->transactionRollback();
+				throw $e;
+			} catch (\Error $e) {
+				$this->transactionRollback();
+				throw $e;
 			}
 		} else {
 			$uniqueId = $this->genUniqueId();
 			$this->exec("SAVEPOINT {$uniqueId}");
 			try {
 				$result = call_user_func($callback, $this);
+				$this->exec("ROLLBACK TO {$uniqueId}");
 			} catch (\Exception $e) {
-				$exception = $e;
-			}
-			$this->exec("ROLLBACK TO {$uniqueId}");
-			if($exception !== null) {
-				throw $exception;
+				$this->exec("ROLLBACK TO {$uniqueId}");
+				throw $e;
+			} catch (\Error $e) {
+				$this->exec("ROLLBACK TO {$uniqueId}");
+				throw $e;
 			}
 		}
 		return $result;
 	}
-
+	
 	/**
 	 * @param int|callable $tries
 	 * @param callable|null $callback
 	 * @return mixed
 	 * @throws \Exception
-	 * @throws null
+	 * @throws \Error
 	 */
 	public function transaction($tries = 1, $callback = null) {
 		if(is_callable($tries)) {
 			$callback = $tries;
 			$tries = 1;
 		} elseif(!is_callable($callback)) {
-			throw new \Exception('$callback must be a callable');
+			throw new RuntimeException('$callback must be a callable');
 		}
-		$e = null;
-		if(!$this->pdo->inTransaction()) {
-			for(; $tries--;) {
+		$result = null;
+		$exception = null;
+		for(; $tries--;) {
+			if(!$this->pdo->inTransaction()) {
+				$this->transactionStart();
 				try {
-					$this->transactionStart();
 					$result = call_user_func($callback, $this);
+					$exception = null;
 					$this->transactionCommit();
-					return $result;
 				} catch (\Exception $e) {
 					$this->transactionRollback();
+					$exception = $e;
+				} catch (\Error $e) {
+					$this->transactionRollback();
+					$exception = $e;
 				}
-			}
-		} else {
-			$uniqueId = $this->genUniqueId();
-			try {
+			} else {
+				$uniqueId = $this->genUniqueId();
 				$this->exec("SAVEPOINT {$uniqueId}");
-				$result = call_user_func($callback, $this);
-				$this->exec("RELEASE SAVEPOINT {$uniqueId}");
-				return $result;
-			} catch (\Exception $e) {
-				$this->exec("ROLLBACK TO {$uniqueId}");
+				try {
+					$result = call_user_func($callback, $this);
+					$exception = null;
+					$this->exec("RELEASE SAVEPOINT {$uniqueId}");
+				} catch (\Exception $e) {
+					$this->exec("ROLLBACK TO {$uniqueId}");
+					$exception = $e;
+				} catch (\Error $e) {
+					$this->exec("ROLLBACK TO {$uniqueId}");
+					$exception = $e;
+				}
 			}
 		}
-		throw $e;
+		if($exception !== null) {
+			throw $exception;
+		}
+		return $result;
 	}
 
 	/**
 	 * @param callable $fn
 	 * @return $this
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 */
 	private function transactionEnd($fn) {
 		$this->transactionLevel--;
 		if($this->transactionLevel < 0) {
-			throw new \Exception("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction");
+			throw new RuntimeException("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction");
 		}
 		if((int) $this->transactionLevel === 0) {
 			if($this->outerTransaction) {
@@ -373,12 +389,12 @@ private function transactionEnd($fn) {
 	 * @param string $query
 	 * @param callable $fn
 	 * @return QueryStatement
-	 * @throws Exception
+	 * @throws RuntimeException
 	 */
 	private function buildQueryStatement($query, $fn) {
 		$stmt = call_user_func($fn, $query);
 		if(!$stmt) {
-			throw new Exception("Could not execute statement:\n{$query}");
+			throw new RuntimeException("Could not execute statement:\n{$query}");
 		}
 		$stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);
 		return $stmtWrapper;