rkrx / php-mysql-query-builder

src/Builder/Expr/DBExprFilter.php

Spacing +11 added lines, -11 removed lines

@@ -27,16 +27,16 @@ 
 		$this->value = $data;
 		$this->keyPath = $this->buildKey($keyPath);
 		$this->value = $this->recursiveGet($data, $this->keyPath, null);
-		if($validator === null) {
-			$validator = function ($data) {
-				if(is_array($data)) {
+		if ($validator === null) {
+			$validator = function($data) {
+				if (is_array($data)) {
 					return $this->isValidArray($data);
 				}
 				return (string) $data !== '';
 			};
 		}
-		if($validationResultHandler === null) {
-			$validationResultHandler = static function () {};
+		if ($validationResultHandler === null) {
+			$validationResultHandler = static function() {};
 		}
 		$this->validator = $validator;
 		$this->validationResultHandler = $validationResultHandler;
@@ -73,10 +73,10 @@ 
 	 * @return string[]
 	 */
 	private function buildKey($keyPath): array {
-		if(is_string($keyPath)) {
+		if (is_string($keyPath)) {
 			$keyPath = explode('.', $keyPath);
 		}
-		if(!is_array($keyPath)) {
+		if (!is_array($keyPath)) {
 			throw new RuntimeException('Invalid key');
 		}
 		return $keyPath;
@@ -87,8 +87,8 @@ 
 	 * @return bool
 	 */
 	private function isValidArray(array $array): bool {
-		$data = array_filter($array, function ($value) {
-			if(is_array($value)) {
+		$data = array_filter($array, function($value) {
+			if (is_array($value)) {
 				return $this->isValidArray($value);
 			}
 			return (string) $value !== '';
@@ -107,9 +107,9 @@ 
 		if (!$count) {
 			return $default;
 		}
-		foreach($path as $idxValue) {
+		foreach ($path as $idxValue) {
 			$part = $idxValue;
-			if(!array_key_exists($part, $array)) {
+			if (!array_key_exists($part, $array)) {
 				return $default;
 			}
 			$array = $array[$part];

src/Builder/Expr/RequiredDBFilterMap.php

Spacing +2 added lines, -2 removed lines

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

src/Builder/Expr/DBExprOrderBySpec.php

Spacing +5 added lines, -5 removed lines

@@ -11,16 +11,16 @@
 	 */
 	public function __construct(array $spec, array $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/Helpers/LazyRowGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@
 	 * @return Generator|mixed[]
 	 */
 	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
 					continue;
-				} elseif($result !== null) {
+				} elseif ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;

src/Builder/Helpers/FieldTypeProvider.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	 */
 	public static function getFieldTypes(QueryStatement $statement): array {
 		$fieldTypes = [];
-		for($i = 0; $column = $statement->getColumnMeta($i); $i++) {
+		for ($i = 0; $column = $statement->getColumnMeta($i); $i++) {
 			$fieldTypes[$column['name']] = self::getTypeFromNativeType($column['native_type']);
 		}
 		return $fieldTypes;

src/Builder/Helpers/FieldValueConverter.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 	 * @return array
 	 */
 	public static function convertValues(array $row, array $columnDefinitions): array {
-		foreach($row as $key => &$value) {
-			if($value !== null) {
+		foreach ($row as $key => &$value) {
+			if ($value !== null) {
 				$value = self::convertValue($value, $columnDefinitions[$key]);
 			}
 		}

src/Builder/Traits/JoinBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -49,15 +49,15 @@
 	 */
 	protected function buildJoins(string $query): string {
 		$arr = [];
-		foreach($this->joinTables as $table) {
+		foreach ($this->joinTables as $table) {
 			$join = $table['type']." JOIN\n";
-			$join .= "\t" . $this->buildTableName($table['alias'], $table['name']);
-			if($table['expression']) {
-				$join .= " ON " . $this->db()->quoteExpression($table['expression'], $table['arguments']);
+			$join .= "\t".$this->buildTableName($table['alias'], $table['name']);
+			if ($table['expression']) {
+				$join .= " ON ".$this->db()->quoteExpression($table['expression'], $table['arguments']);
 			}
 			$arr[] = $join;
 		}
-		if(count($arr)) {
+		if (count($arr)) {
 			$query .= implode("\n", $arr)."\n";
 		}
 		return $query;

src/Builder/Traits/LimitBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
 	 */
 	protected function buildLimit(string $query, ?int $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/Traits/OrderByBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -15,8 +15,8 @@ 
 	 * @return $this
 	 */
 	public function orderBy($expression, string $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(string $fieldName, array $values) {
 		$expr = [];
-		foreach(array_values($values) as $idx => $value) {
+		foreach (array_values($values) as $idx => $value) {
 			$expr[] = $this->db()->quoteExpression("WHEN ? THEN ?", [$value, $idx]);
 		}
 		$this->orderBy[] = [sprintf("CASE %s\n\t\t%s\n\tEND", $this->db()->quoteField($fieldName), implode("\n\t\t", $expr)), 'ASC'];
@@ -44,12 +44,12 @@ 
 	 * @return string
 	 */
 	protected function buildOrder(string $query): string {
-		if(!count($this->orderBy)) {
+		if (!count($this->orderBy)) {
 			return $query;
 		}
 		$query .= "ORDER BY\n";
 		$arr = [];
-		foreach($this->orderBy as list($expression, $direction)) {
+		foreach ($this->orderBy as list($expression, $direction)) {
 			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
 		return $query.implode(",\n", $arr)."\n";
@@ -61,8 +61,8 @@ 
 	 */
 	private function addOrder($expression, string $direction) {
 		$direction = $this->fixDirection($direction);
-		if(is_array($expression)) {
-			if(!count($expression)) {
+		if (is_array($expression)) {
+			if (!count($expression)) {
 				return;
 			}
 			$arguments = [