Fixed various issues reported by travis-ci

Author: rkrx

src/Builder/Traits/ConditionDefinition.php renamed to src/Builder/Helpers/ConditionAddHelper.php

@@ -1,37 +1,35 @@
 <?php
-namespace Kir\MySQL\Builder\Traits;
+namespace Kir\MySQL\Builder\Helpers;
 
 use Closure;
 use Kir\MySQL\Builder\Expr\OptionalExpression;
 
-trait ConditionDefinition {
+abstract class ConditionAddHelper {
 	/**
 	 * @param Closure $addFn
 	 * @param string|array|object|OptionalExpression $expression
 	 * @param mixed[] $args
-	 * @return $this
 	 */
-	protected function addCondition(Closure $addFn, $expression, ...$args) {
+	public static function addCondition(Closure $addFn, $expression, ...$args) {
 		if($expression instanceof OptionalExpression) {
 			if($expression->isValid()) {
 				$addFn($expression->getExpression(), $expression->getValue());
 			}
 		} elseif(is_object($expression)) {
-			$this->addAsArray($addFn, (array) $expression, $args);
+			self::addAsArray($addFn, (array) $expression, $args);
 		} elseif(is_array($expression)) {
-			$this->addAsArray($addFn, $expression, $args);
+			self::addAsArray($addFn, $expression, $args);
 		} else {
 			$addFn($expression, $args);
 		}
-		return $this;
 	}
 
 	/**
 	 * @param Closure $addFn
 	 * @param array $expression
 	 * @param array $args
 	 */
-	private function addAsArray(Closure $addFn, array $expression, array $args) {
+	private static function addAsArray(Closure $addFn, array $expression, array $args) {
 		if(count($expression) > 0) {
 			$addFn($expression, $args);
 		}

src/Builder/Traits/HavingBuilder.php

@@ -2,11 +2,11 @@
 namespace Kir\MySQL\Builder\Traits;
 
 use Kir\MySQL\Builder\Expr\OptionalExpression;
+use Kir\MySQL\Builder\Helpers\ConditionAddHelper;
 use Kir\MySQL\Builder\Internal\ConditionBuilder;
 
 trait HavingBuilder {
 	use AbstractDB;
-	use ConditionDefinition;
 
 	/** @var array[] */
 	private $having = [];
@@ -18,14 +18,15 @@ trait HavingBuilder {
 	 */
 	public function having($expression, ...$args) {
 		$fn = function (...$args) { $this->having[] = $args; };
-		return $this->addCondition($fn, $expression, ...$args);
+		ConditionAddHelper::addCondition($fn, $expression, ...$args);
+		return $this;
 	}
 
 	/**
 	 * @param string $query
 	 * @return string
 	 */
-	protected function buildHavingConditions($query) {
+	protected function buildHavingConditions(string $query) {
 		return ConditionBuilder::build($this->db(), $query, $this->having, 'HAVING');
 	}
 }

src/Builder/Traits/WhereBuilder.php

@@ -2,11 +2,11 @@
 namespace Kir\MySQL\Builder\Traits;
 
 use Kir\MySQL\Builder\Expr\OptionalExpression;
+use Kir\MySQL\Builder\Helpers\ConditionAddHelper;
 use Kir\MySQL\Builder\Internal\ConditionBuilder;
 
 trait WhereBuilder {
 	use AbstractDB;
-	use ConditionDefinition;
 
 	/** @var array[] */
 	private $where = [];
@@ -18,14 +18,15 @@ trait WhereBuilder {
 	 */
 	public function where($expression, ...$args) {
 		$fn = function (...$args) { $this->where[] = $args; };
-		return $this->addCondition($fn, $expression, ...$args);
+		ConditionAddHelper::addCondition($fn, $expression, ...$args);
+		return $this;
 	}
 
 	/**
 	 * @param string $query
 	 * @return string
 	 */
-	protected function buildWhereConditions($query) {
+	protected function buildWhereConditions(string $query) {
 		return ConditionBuilder::build($this->db(), $query, $this->where, 'WHERE');
 	}
 }