- Fixed Exception-Handling (Replaced \Exception with more appropriate \RuntimeException)

- Fixed various PHPDocs

Author: rkrx

src/Builder/Exception.php

@@ -1,5 +1,7 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-class Exception extends \Exception {
+use RuntimeException;
+
+class Exception extends RuntimeException {
 }

src/Builder/Expr/DBExprFilter.php

@@ -4,7 +4,7 @@
 use Exception;
 
 class DBExprFilter implements OptionalExpression {
-	/** @var */
+	/** @var mixed */
 	private $expression;
 	/** @var mixed */
 	private $value;

src/Builder/Helpers/YieldPolyfillIterator.php

@@ -4,6 +4,7 @@
 use Closure;
 use Iterator;
 use Kir\MySQL\Builder\QueryStatement;
+use RuntimeException;
 
 class YieldPolyfillIterator implements Iterator {
 	/** @var Closure|null */
@@ -88,7 +89,7 @@ public function valid() {
 	 */
 	public function rewind() {
 		if($this->stmt !== null) {
-			throw new \Exception("It's not possible to rewind this iterator");
+			throw new RuntimeException("It's not possible to rewind this iterator");
 		}
 		$this->stmt = call_user_func($this->statementFactory);
 		$this->idx = -1;

src/Builder/Insert.php

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

src/Builder/InsertUpdateStatement.php

@@ -26,7 +26,7 @@ public function setMask(array $mask) {
 	/**
 	 * @param array $fields
 	 * @param array $query
-	 * @return string
+	 * @return string[]
 	 */
 	protected function buildFieldList(array $fields, array $query = array()) {
 		foreach ($fields as $fieldName => $fieldValue) {

src/Builder/RunnableSelect.php

@@ -11,6 +11,7 @@
 use Kir\MySQL\Builder\Helpers\YieldPolyfillIterator;
 use Kir\MySQL\Databases\MySQL;
 use PDO;
+use RuntimeException;
 use Traversable;
 
 /**
@@ -193,7 +194,7 @@ public function fetchValue($default = null) {
 	}
 
 	/**
-	 * @return bool
+	 * @return int
 	 */
 	public function getFoundRows() {
 		return $this->foundRows;
@@ -202,14 +203,14 @@ public function getFoundRows() {
 	/**
 	 * @param callback $fn
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 */
 	private function createTempStatement($fn) {
 		$stmt = $this->createStatement();
 		$res = null;
 		try {
 			$res = call_user_func($fn, $stmt);
-		} catch (\Exception $e) { // PHP 5.4 compatibility
+		} catch (RuntimeException $e) { // PHP 5.4 compatibility
 			$stmt->closeCursor();
 			throw $e;
 		}
@@ -221,6 +222,7 @@ private function createTempStatement($fn) {
 	 * @return QueryStatement
 	 */
 	private function createStatement() {
+		/** @var MySQL $db */
 		$db = $this->db();
 		$query = $this->__toString();
 		$statement = $db->prepare($query);
@@ -243,7 +245,7 @@ public function getIterator() {
 	 * @param int $mode
 	 * @param mixed $arg0
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 */
 	private function fetchAll(Closure $callback = null, $mode, $arg0 = null) {
 		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) {
@@ -276,7 +278,7 @@ private function fetchAll(Closure $callback = null, $mode, $arg0 = null) {
 	 * @param Closure $callback
 	 * @param int $mode
 	 * @param mixed $arg0
-	 * @return Generator|YieldPolyfillIterator|mixed[]
+	 * @return Traversable|YieldPolyfillIterator|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
 		if(version_compare(PHP_VERSION, '5.5', '<')) {

src/Builder/Traits/HavingBuilder.php

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

src/Builder/Traits/WhereBuilder.php

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

src/Builder/Update.php

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

src/QueryLogger/QueryLoggers.php

@@ -2,9 +2,7 @@
 namespace Kir\MySQL\QueryLogger;
 
 class QueryLoggers {
-	/**
-	 * @var QueryLogger[]
-	 */
+	/** @var QueryLogger[] */
 	private $queryLoggers = [];
 
 	/**

src/Tools/AliasRegistry.php

@@ -1,11 +1,11 @@
 <?php
 namespace Kir\MySQL\Tools;
 
+use RuntimeException;
+
 class AliasRegistry {
-	/**
-	 * @var string[]
-	 */
-	private $aliases = array();
+	/** @var string[] */
+	private $aliases = [];
 
 	/**
 	 * @param string $alias
@@ -19,12 +19,12 @@ public function add($alias, $string) {
 
 	/**
 	 * @param string $alias
-	 * @throws \Exception
+	 * @throws RuntimeException
 	 * @return string
 	 */
 	public function get($alias) {
 		if (!array_key_exists($alias, $this->aliases)) {
-			throw new \Exception("Alias not found: {$alias}");
+			throw new RuntimeException("Alias not found: {$alias}");
 		}
 		return $this->aliases[$alias];
 	}

src/Tools/AliasReplacer.php

@@ -2,9 +2,7 @@
 namespace Kir\MySQL\Tools;
 
 class AliasReplacer {
-	/**
-	 * @var AliasRegistry
-	 */
+	/** @var AliasRegistry */
 	private $aliasRegistry;
 
 	/**