rkrx / php-mysql-query-builder

src/Builder/Expr/RequiredDBFilterMap.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 	 * @return DBExprFilter
 	 */
 	public function __invoke($expression, $keyPath, $validator = null) {
-		return new DBExprFilter($expression, $this->map, $keyPath, $validator, function ($result, array $data) {
-			if(!$result) {
+		return new DBExprFilter($expression, $this->map, $keyPath, $validator, function($result, array $data) {
+			if (!$result) {
 				throw new RequiredValueNotFoundException(sprintf("Required value %s not found", $data['key']));
 			}
 		});

src/Builder/Helpers/YieldPolyfillIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	}
 
 	/**
-	 * @return mixed
+	 * @return integer
 	 */
 	public function key() {
 		return $this->idx;

Spacing +8 added lines, -8 removed lines

@@ -42,16 +42,16 @@ 
 	 */
 	public function current() {
 		$row = $this->currentItem;
-		if($this->preserveTypes) {
+		if ($this->preserveTypes) {
 			$columnDefinitions = FieldTypeProvider::getFieldTypes($this->getStmt());
 			$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 		}
 		$callback = $this->callback;
-		if($callback !== null) {
+		if ($callback !== null) {
 			$result = $callback($row);
-			if($result instanceof DBIgnoreRow) {
+			if ($result instanceof DBIgnoreRow) {
 				// Do nothing in this case
-			} elseif($result !== null) {
+			} elseif ($result !== null) {
 				return $result;
 			} else {
 				return $row;
@@ -79,7 +79,7 @@ 
 	 */
 	public function valid() {
 		$result = !!$this->currentItem;
-		if(!$result) {
+		if (!$result) {
 			$this->closeCursor();
 		}
 		return $result;
@@ -88,7 +88,7 @@ 
 	/**
 	 */
 	public function rewind() {
-		if($this->stmt !== null) {
+		if ($this->stmt !== null) {
 			throw new RuntimeException("It's not possible to rewind this iterator");
 		}
 		$this->stmt = call_user_func($this->statementFactory);
@@ -100,7 +100,7 @@ 
 	 * @return QueryStatement
 	 */
 	private function getStmt() {
-		if($this->stmt === null) {
+		if ($this->stmt === null) {
 			$this->rewind();
 		}
 		return $this->stmt;
@@ -109,7 +109,7 @@ 
 	/**
 	 */
 	private function closeCursor() {
-		if($this->stmt instanceof QueryStatement) {
+		if ($this->stmt instanceof QueryStatement) {
 			$this->stmt->closeCursor();
 		}
 		$this->stmt = null;

src/Builder/Select.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	}
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function getFields() {
 		return $this->fields;

src/Builder/Traits/LimitBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
 	 */
 	protected function buildLimit($query, $offset = null) {
 		$limit = $this->limit;
-		if($limit === null && $offset !== null) {
+		if ($limit === null && $offset !== null) {
 			$limit = '18446744073709551615';
 		}
-		if($limit !== null) {
+		if ($limit !== null) {
 			$query .= "LIMIT\n\t{$limit}\n";
 		}
 		return $query;

src/Builder/Helpers/LazyRowGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -21,16 +21,16 @@
 	 * @return array[]|\Generator
 	 */
 	public function generate(QueryStatement $statement, Closure $callback = null) {
-		while($row = $statement->fetch()) {
-			if($this->preserveTypes) {
+		while ($row = $statement->fetch()) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 			}
-			if($callback !== null) {
+			if ($callback !== null) {
 				$result = $callback($row);
-				if($result instanceof DBIgnoreRow) {
+				if ($result instanceof DBIgnoreRow) {
 					// Do nothing in this case
-				} elseif($result !== null) {
+				} elseif ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;

src/Builder/QueryStatement.php

Spacing +4 added lines, -4 removed lines

@@ -46,12 +46,12 @@ 
 	 * @return $this
 	 */
 	public function setFetchMode($mode, $arg0 = null, array $arg1 = null) {
-		if($arg1 !== null) {
+		if ($arg1 !== null) {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$this->statement->setFetchMode($mode, $arg0, $arg1);
 			return $this;
 		}
-		if($arg0 !== null) {
+		if ($arg0 !== null) {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$this->statement->setFetchMode($mode, $arg0);
 			return $this;
@@ -70,7 +70,7 @@ 
 			$timer = microtime(true);
 			$response = $this->statement->execute($params);
 			$this->queryLoggers->log($this->query, microtime(true)-$timer);
-			if(!$response) {
+			if (!$response) {
 				throw new SqlException('Execution returned with "false".');
 			}
 		});
@@ -85,7 +85,7 @@ 
 	 */
 	public function fetchAll($fetchStyle = null, $fetchArgument = null, array $ctorArgs = []) {
 		return $this->exceptionHandler(function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
-			if($fetchArgument !== null) {
+			if ($fetchArgument !== null) {
 				return $this->statement->fetchAll($fetchStyle, $fetchArgument, $ctorArgs);
 			}
 			return $this->statement->fetchAll($fetchStyle);

src/Builder/Traits/OrderByBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -15,8 +15,8 @@ 
 	 * @return $this
 	 */
 	public function orderBy($expression, $direction = 'asc') {
-		if($expression instanceof OrderBySpecification) {
-			foreach($expression->getFields() as $field) {
+		if ($expression instanceof OrderBySpecification) {
+			foreach ($expression->getFields() as $field) {
 				$this->addOrder($field[0], $field[1]);
 			}
 			return $this;
@@ -32,7 +32,7 @@ 
 	 */
 	public function orderByValues($fieldName, array $values) {
 		$expr = [];
-		foreach(array_values($values) as $idx => $value) {
+		foreach (array_values($values) as $idx => $value) {
 			$expr[] = $this->db()->quoteExpression("WHEN ? THEN ?", array($value, $idx));
 		}
 		$this->orderBy[] = array(sprintf("CASE %s\n\t\t%s\n\tEND", $this->db()->quoteField($fieldName), join("\n\t\t", $expr)), 'ASC');
@@ -44,12 +44,12 @@ 
 	 * @return string
 	 */
 	protected function buildOrder($query) {
-		if(!count($this->orderBy)) {
+		if (!count($this->orderBy)) {
 			return $query;
 		}
 		$query .= "ORDER BY\n";
 		$arr = array();
-		foreach($this->orderBy as $order) {
+		foreach ($this->orderBy as $order) {
 			list($expression, $direction) = $order;
 			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
@@ -62,8 +62,8 @@ 
 	 */
 	private function addOrder($expression, $direction) {
 		$direction = $this->fixDirection($direction);
-		if(is_array($expression)) {
-			if(!count($expression)) {
+		if (is_array($expression)) {
+			if (!count($expression)) {
 				return;
 			}
 			$arguments = array(

src/Builder/Expr/DBExprOrderBySpec.php

Spacing +5 added lines, -5 removed lines

@@ -11,16 +11,16 @@
 	 */
 	public function __construct($spec, $sortFieldsSpec) {
 		$expressions = [];
-		foreach($spec as $specReference => $dbExpr) {
-			if(is_int($specReference)) {
+		foreach ($spec as $specReference => $dbExpr) {
+			if (is_int($specReference)) {
 				$specReference = $dbExpr;
 			}
 			$expressions[$specReference] = $dbExpr;
 		}
-		foreach($sortFieldsSpec as $sortFieldSpec) {
-			if(array_key_exists(0, $sortFieldSpec) && array_key_exists($sortFieldSpec[0], $expressions)) {
+		foreach ($sortFieldsSpec as $sortFieldSpec) {
+			if (array_key_exists(0, $sortFieldSpec) && array_key_exists($sortFieldSpec[0], $expressions)) {
 				$direction = 'ASC';
-				if(array_key_exists(1, $sortFieldSpec) && strtoupper($sortFieldSpec[1]) !== 'ASC') {
+				if (array_key_exists(1, $sortFieldSpec) && strtoupper($sortFieldSpec[1]) !== 'ASC') {
 					$direction = 'DESC';
 				}
 				$this->fields[] = [

src/Builder/RunnableSelect.php

Doc Comments +3 added lines, -3 removed lines

@@ -243,7 +243,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return mixed
 	 * @throws RuntimeException
 	 */
@@ -277,7 +277,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return Traversable|YieldPolyfillIterator|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
@@ -297,7 +297,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param null|string $arg0
 	 * @param Closure $resultValidator
 	 * @return mixed
 	 * @throws \Exception

Spacing +26 added lines, -26 removed lines

@@ -94,7 +94,7 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchRow(Closure $callback = null) {
-		return $this->fetch($callback, PDO::FETCH_ASSOC, null, function ($row) {
+		return $this->fetch($callback, PDO::FETCH_ASSOC, null, function($row) {
 			return ['valid' => is_array($row), 'default' => []];
 		});
 	}
@@ -125,7 +125,7 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchObject($className = null, Closure $callback = null) {
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, function ($row) {
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, function($row) {
 			return ['valid' => is_object($row), 'default' => null];
 		});
 	}
@@ -135,11 +135,11 @@ 
 	 * @return mixed[]
 	 */
 	public function fetchKeyValue($treatValueAsArray = false) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($treatValueAsArray) {
-			if($treatValueAsArray) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($treatValueAsArray) {
+			if ($treatValueAsArray) {
 				$rows = $statement->fetchAll(\PDO::FETCH_ASSOC);
 				$result = array();
-				foreach($rows as $row) {
+				foreach ($rows as $row) {
 					list($key) = array_values($row);
 					$result[$key] = $row;
 				}
@@ -156,11 +156,11 @@ 
 	public function fetchGroups(array $fields) {
 		$rows = $this->fetchRows();
 		$result = array();
-		foreach($rows as $row) {
+		foreach ($rows as $row) {
 			$tmp = &$result;
-			foreach($fields as $field) {
+			foreach ($fields as $field) {
 				$value = $row[$field];
-				if(!array_key_exists($value, $tmp)) {
+				if (!array_key_exists($value, $tmp)) {
 					$tmp[$value] = [];
 				}
 				$tmp = &$tmp[$value];
@@ -174,7 +174,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray() {
-		return $this->createTempStatement(function (QueryStatement $stmt) {
+		return $this->createTempStatement(function(QueryStatement $stmt) {
 			return $stmt->fetchAll(\PDO::FETCH_COLUMN);
 		});
 	}
@@ -184,9 +184,9 @@ 
 	 * @return null|bool|string|int|float
 	 */
 	public function fetchValue($default = null) {
-		return $this->createTempStatement(function (QueryStatement $stmt) use ($default) {
+		return $this->createTempStatement(function(QueryStatement $stmt) use ($default) {
 			$result = $stmt->fetch(\PDO::FETCH_NUM);
-			if($result !== false) {
+			if ($result !== false) {
 				return $result[0];
 			}
 			return $default;
@@ -227,7 +227,7 @@ 
 		$query = $this->__toString();
 		$statement = $db->prepare($query);
 		$statement->execute($this->values);
-		if($this->getCalcFoundRows()) {
+		if ($this->getCalcFoundRows()) {
 			$this->foundRows = (int) $db->query('SELECT FOUND_ROWS()')->fetchColumn();
 		}
 		return $statement;
@@ -248,20 +248,20 @@ 
 	 * @throws RuntimeException
 	 */
 	private function fetchAll(Closure $callback = null, $mode, $arg0 = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($callback, $mode, $arg0) {
 			$statement->setFetchMode($mode, $arg0);
 			$data = $statement->fetchAll();
-			if($this->preserveTypes) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				foreach($data as &$row) {
+				foreach ($data as &$row) {
 					$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 				}
 			}
-			if($callback !== null) {
-				return call_user_func(function ($resultData = []) use ($data, $callback) {
-					foreach($data as $row) {
+			if ($callback !== null) {
+				return call_user_func(function($resultData = []) use ($data, $callback) {
+					foreach ($data as $row) {
 						$result = $callback($row);
-						if($result !== null && !($result instanceof DBIgnoreRow)) {
+						if ($result !== null && !($result instanceof DBIgnoreRow)) {
 							$resultData[] = $result;
 						} else {
 							$resultData[] = $row;
@@ -281,8 +281,8 @@ 
 	 * @return Traversable|YieldPolyfillIterator|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
-		if(version_compare(PHP_VERSION, '5.5', '<')) {
-			return new YieldPolyfillIterator($callback, $this->preserveTypes, function () use ($mode, $arg0) {
+		if (version_compare(PHP_VERSION, '5.5', '<')) {
+			return new YieldPolyfillIterator($callback, $this->preserveTypes, function() use ($mode, $arg0) {
 				$statement = $this->createStatement();
 				$statement->setFetchMode($mode, $arg0);
 				return $statement;
@@ -303,20 +303,20 @@ 
 	 * @throws \Exception
 	 */
 	private function fetch(Closure $callback = null, $mode, $arg0 = null, Closure $resultValidator = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0, $resultValidator) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($callback, $mode, $arg0, $resultValidator) {
 			$statement->setFetchMode($mode, $arg0);
 			$row = $statement->fetch();
 			$result = $resultValidator($row);
-			if(!$result['valid']) {
+			if (!$result['valid']) {
 				return $result['default'];
 			}
-			if($this->preserveTypes) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 			}
-			if($callback !== null) {
+			if ($callback !== null) {
 				$result = $callback($row);
-				if($result !== null) {
+				if ($result !== null) {
 					$row = $result;
 				}
 			}