Removed some form of code duplication shown by scrutinizer

Author: rkrx

src/Builder/Insert.php

@@ -5,33 +5,19 @@
 use UnexpectedValueException;
 
 class Insert extends InsertUpdateStatement {
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $fields = array();
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $update = array();
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	private $table = null;
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	private $keyField = null;
-	/**
-	 * @var bool
-	 */
+	/** @var bool */
 	private $ignore = false;
-	/**
-	 * @var Select
-	 */
+	/** @var Select */
 	private $from = null;
-	/**
-	 * @var callable
-	 */
+	/** @var callable */
 	private $tableFields = null;
 
 	/**
@@ -77,12 +63,7 @@ public function setKey($field) {
 	 * @return $this
 	 */
 	public function add($field, $value) {
-		if ($this->isFieldNameValid($field)) {
-			throw new UnexpectedValueException('Field name is invalid');
-		}
-		$sqlField = $field;
-		$sqlValue = $this->db()->quote($value);
-		$this->fields[$sqlField] = $sqlValue;
+		$this->fields = $this->addTo($this->fields, $field, $value);
 		return $this;
 	}
 
@@ -93,12 +74,7 @@ public function add($field, $value) {
 	 * @return $this
 	 */
 	public function update($field, $value) {
-		if ($this->isFieldNameValid($field)) {
-			throw new UnexpectedValueException('Field name is invalid');
-		}
-		$sqlField = $field;
-		$sqlValue = $this->db()->quote($value);
-		$this->update[$sqlField] = $sqlValue;
+		$this->update = $this->addTo($this->update, $field, $value);
 		return $this;
 	}
 
@@ -148,13 +124,9 @@ public function addOrUpdateExpr($str) {
 	 * @return $this
 	 */
 	public function addAll(array $data, array $mask = null) {
-		if($mask !== null) {
-			$data = array_intersect_key($data, array_combine($mask, $mask));
-		}
-		$data = $this->clearValues($data);
-		foreach ($data as $field => $value) {
+		$this->addAllTo($data, $mask, function ($field, $value) {
 			$this->add($field, $value);
-		}
+		});
 		return $this;
 	}
 
@@ -164,15 +136,11 @@ public function addAll(array $data, array $mask = null) {
 	 * @return $this
 	 */
 	public function updateAll(array $data, array $mask = null) {
-		if($mask !== null) {
-			$data = array_intersect_key($data, array_combine($mask, $mask));
-		}
-		$data = $this->clearValues($data);
-		foreach ($data as $field => $value) {
-			if ($field != $this->keyField) {
+		$this->addAllTo($data, $mask, function ($field, $value) {
+			if ($field !== $this->keyField) {
 				$this->update($field, $value);
 			}
-		}
+		});
 		return $this;
 	}
 
@@ -234,6 +202,38 @@ public function __toString() {
 		return $query;
 	}
 
+	/**
+	 * @param array $fields
+	 * @param string $field
+	 * @param bool|int|float|string $value
+	 * @return array
+	 */
+	private function addTo($fields, $field, $value) {
+		if ($this->isFieldNameValid($field)) {
+			throw new UnexpectedValueException('Field name is invalid');
+		}
+		$sqlField = $field;
+		$sqlValue = $this->db()->quote($value);
+		$fields[$sqlField] = $sqlValue;
+		return $fields;
+	}
+
+	/**
+	 * @param array $data
+	 * @param array $mask
+	 * @param callable $fn
+	 * @return $this
+	 */
+	private function addAllTo($data, $mask, $fn) {
+		if($mask !== null) {
+			$data = array_intersect_key($data, array_combine($mask, $mask));
+		}
+		$data = $this->clearValues($data);
+		foreach ($data as $field => $value) {
+			call_user_func($fn, $field, $value);
+		}
+	}
+
 	/**
 	 * @return string
 	 */

src/Builder/Internal/ConditionBuilder.php

@@ -0,0 +1,28 @@
+<?php
+namespace Kir\MySQL\Builder\Internal;
+
+use Kir\MySQL\Database;
+
+final class ConditionBuilder {
+	/**
+	 * @param Database $db
+	 * @param string $query
+	 * @param array $conditions
+	 * @param string $token
+	 * @return string
+	 */
+	public static function build(Database $db, $query, array $conditions, $token) {
+		if(!count($conditions)) {
+			return $query;
+		}
+		$query .= "{$token}\n";
+		$arr = array();
+		foreach($conditions as $condition) {
+			list($expression, $arguments) = $condition;
+			$expr = $db->quoteExpression($expression, $arguments);
+			$arr[] = "\t({$expr})";
+		}
+		$query .= join("\n\tAND\n", $arr);
+		return $query."\n";
+	}
+}

src/Builder/QueryStatement.php

@@ -43,10 +43,9 @@ public function execute(array $params = []) {
 	}
 
 	/**
-	 * @param int $fetchStyle
 	 * @return array
 	 */
-	public function fetchAll($fetchStyle = PDO::FETCH_ASSOC) {
+	public function fetchAll() {
 		$args = func_get_args();
 		return call_user_func_array([$this->statement, 'fetchAll'], $args);
 	}

src/Builder/RunnableSelect.php

@@ -4,19 +4,11 @@
 /**
  */
 class RunnableSelect extends Select {
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $values = array();
-
-	/**
-	 * @var bool
-	 */
+	/** @var bool */
 	private $preserveTypes;
-
-	/**
-	 * @var bool
-	 */
+	/** @var int */
 	private $foundRows = 0;
 
 	/**

src/Builder/Traits/GroupByBuilder.php

@@ -10,10 +10,9 @@ trait GroupByBuilder {
 	private $groupBy = array();
 
 	/**
-	 * @param string $expression
 	 * @return $this
 	 */
-	public function groupBy($expression) {
+	public function groupBy() {
 		foreach(func_get_args() as $expression) {
 			if(is_array($expression)) {
 				if(!count($expression)) {
@@ -23,7 +22,7 @@ public function groupBy($expression) {
 					$expression[0],
 					array_slice($expression, 1)
 				);
-				$expression = call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);
+				$expression = $this->quoteExpr($arguments);
 			}
 			$this->groupBy[] = $expression;
 		}
@@ -45,4 +44,12 @@ protected function buildGroups($query) {
 		}
 		return $query.join(",\n", $arr)."\n";
 	}
+
+	/**
+	 * @param array $arguments
+	 * @return mixed
+	 */
+	protected function quoteExpr(array $arguments) {
+		return call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);
+	}
 }

src/Builder/Traits/HavingBuilder.php

@@ -1,12 +1,12 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
+use Kir\MySQL\Builder\Internal\ConditionBuilder;
+
 trait HavingBuilder {
 	use AbstractDB;
 
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $having = array();
 
 	/**
@@ -23,17 +23,6 @@ public function having($expression) {
 	 * @return string
 	 */
 	protected function buildHavingConditions($query) {
-		if(!count($this->having)) {
-			return $query;
-		}
-		$query .= "HAVING\n";
-		$arr = array();
-		foreach($this->having as $condition) {
-			list($expression, $arguments) = $condition;
-			$expr = $this->db()->quoteExpression($expression, $arguments);
-			$arr[] = "\t({$expr})";
-		}
-		$query .= join("\n\tAND\n", $arr);
-		return $query."\n";
+		return ConditionBuilder::build($this->db(), $query, $this->having, 'HAVING');
 	}
 }

src/Builder/Traits/WhereBuilder.php

@@ -1,12 +1,12 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
+use Kir\MySQL\Builder\Internal\ConditionBuilder;
+
 trait WhereBuilder {
 	use AbstractDB;
 
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $where = array();
 
 	/**
@@ -24,17 +24,6 @@ public function where($expression, $param = null) {
 	 * @return string
 	 */
 	protected function buildWhereConditions($query) {
-		if(!count($this->where)) {
-			return $query;
-		}
-		$query .= "WHERE\n";
-		$arr = array();
-		foreach($this->where as $condition) {
-			list($expression, $arguments) = $condition;
-			$expr = $this->db()->quoteExpression($expression, $arguments);
-			$arr[] = "\t({$expr})";
-		}
-		$query .= join("\n\tAND\n", $arr);
-		return $query."\n";
+		return ConditionBuilder::build($this->db(), $query, $this->where, 'WHERE');
 	}
 }

src/QueryLogger/ClosureQueryLogger.php

@@ -8,7 +8,7 @@ class ClosureQueryLogger implements QueryLogger {
 	/**
 	 * @param callable $fn
 	 */
-	function __construct($fn) {
+	public function __construct($fn) {
 		$this->fn = $fn;
 	}
 

src/QueryLogger/LoggerInterfaceQueryLogger.php

@@ -10,7 +10,7 @@ class LoggerInterfaceQueryLogger implements QueryLogger {
 	/**
 	 * @param LoggerInterface $logger
 	 */
-	function __construct(LoggerInterface $logger) {
+	public function __construct(LoggerInterface $logger) {
 		$this->logger = $logger;
 	}