- Changed Exception-Handling

Author: rkrx

src/Builder/Expr/DBExprFilter.php

@@ -1,7 +1,7 @@
 <?php
 namespace Kir\MySQL\Builder\Expr;
 
-use Exception;
+use RuntimeException;
 
 class DBExprFilter implements OptionalExpression {
 	/** @var mixed */
@@ -21,7 +21,6 @@ class DBExprFilter implements OptionalExpression {
 	 * @param string|string[] $keyPath
 	 * @param callable|null $validator
 	 * @param callable|null $validationResultHandler
-	 * @throws Exception
 	 */
 	public function __construct($expression, array $data, $keyPath, $validator = null, $validationResultHandler = null) {
 		$this->expression = $expression;
@@ -72,14 +71,13 @@ public function getValue() {
 	/**
 	 * @param string|string[] $keyPath
 	 * @return string
-	 * @throws Exception
 	 */
 	private function buildKey($keyPath) {
 		if(is_string($keyPath)) {
 			$keyPath = explode('.', $keyPath);
 		}
 		if(!is_array($keyPath)) {
-			throw new Exception('Invalid key');
+			throw new RuntimeException('Invalid key');
 		}
 		return $keyPath;
 	}

src/Builder/Select.php

@@ -11,6 +11,7 @@
 use Kir\MySQL\Builder\Traits\TableNameBuilder;
 use Kir\MySQL\Builder\Traits\UnionBuilder;
 use Kir\MySQL\Builder\Traits\WhereBuilder;
+use RuntimeException;
 
 class Select extends Statement {
 	use TableNameBuilder;
@@ -102,12 +103,11 @@ public function getCalcFoundRows() {
 
 	/**
 	 * @param bool $calcFoundRows
-	 * @throws \Exception
 	 * @return $this
 	 */
 	public function setCalcFoundRows($calcFoundRows = true) {
 		if (ini_get("mysql.trace_mode")) {
-			throw new \Exception('This function cant operate with mysql.trace_mode is set.');
+			throw new RuntimeException('This function cant operate with mysql.trace_mode is set.');
 		}
 		$this->calcFoundRows = $calcFoundRows;
 		return $this;

src/Databases/MySQL.php

@@ -269,7 +269,6 @@ public function transactionStart() {
 
 	/**
 	 * @return $this
-	 * @throws \Exception
 	 */
 	public function transactionCommit() {
 		return $this->transactionEnd(function () {
@@ -279,7 +278,6 @@ public function transactionCommit() {
 
 	/**
 	 * @return $this
-	 * @throws \Exception
 	 */
 	public function transactionRollback() {
 		return $this->transactionEnd(function () {
@@ -290,8 +288,6 @@ public function transactionRollback() {
 	/**
 	 * @param callable|null $callback
 	 * @return mixed
-	 * @throws \Exception
-	 * @throws \Error
 	 */
 	public function dryRun($callback = null) {
 		$result = null;
@@ -302,10 +298,10 @@ public function dryRun($callback = null) {
 				$this->transactionRollback();
 			} catch (\Exception $e) {
 				$this->transactionRollback();
-				throw $e;
+				throw new RuntimeException($e->getMessage(), (int) $e->getCode(), $e);
 			} catch (\Error $e) {
 				$this->transactionRollback();
-				throw $e;
+				throw new RuntimeException($e->getMessage(), (int) $e->getCode(), $e);
 			}
 		} else {
 			$uniqueId = $this->genUniqueId();
@@ -315,10 +311,10 @@ public function dryRun($callback = null) {
 				$this->exec("ROLLBACK TO {$uniqueId}");
 			} catch (\Exception $e) {
 				$this->exec("ROLLBACK TO {$uniqueId}");
-				throw $e;
+				throw new RuntimeException($e->getMessage(), (int) $e->getCode(), $e);
 			} catch (\Error $e) {
 				$this->exec("ROLLBACK TO {$uniqueId}");
-				throw $e;
+				throw new RuntimeException($e->getMessage(), (int) $e->getCode(), $e);
 			}
 		}
 		return $result;
@@ -328,8 +324,6 @@ public function dryRun($callback = null) {
 	 * @param int|callable $tries
 	 * @param callable|null $callback
 	 * @return mixed
-	 * @throws \Exception
-	 * @throws \Error
 	 */
 	public function transaction($tries = 1, $callback = null) {
 		if(is_callable($tries)) {
@@ -371,7 +365,7 @@ public function transaction($tries = 1, $callback = null) {
 			}
 		}
 		if($exception !== null) {
-			throw $exception;
+			throw new RuntimeException($exception->getMessage(), (int) $exception->getCode(), $exception);
 		}
 		return $result;
 	}