rkrx / php-mysql-query-builder

src/Builder/Expr/DBExprFilter.php

Spacing +12 added lines, -12 removed lines

@@ -26,16 +26,16 @@ 
 		$this->expression = $expression;
 		$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;
@@ -53,7 +53,7 @@ 
 	 */
 	public function isValid(): bool {
 		$result = true;
-		if($this->validator !== null) {
+		if ($this->validator !== null) {
 			$result = call_user_func($this->validator, $this->value);
 			call_user_func($this->validationResultHandler, $result, [
 				'value' => $this->value,
@@ -75,10 +75,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;
@@ -89,8 +89,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 !== '';
@@ -109,9 +109,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/RunnableSelect.php

Spacing +40 added lines, -40 removed lines

@@ -78,7 +78,7 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchRowsLazy($callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
+		$callback = $callback ?? (static function($row) { return $row; });
 		yield from $this->fetchLazy($callback, PDO::FETCH_ASSOC);
 	}
 
@@ -86,8 +86,8 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchRow($callback = null): array {
-		$callback = $callback ?? (static function ($row) { return $row; });
-		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static function ($row) {
+		$callback = $callback ?? (static function($row) { return $row; });
+		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static function($row) {
 			return ['valid' => is_array($row), 'default' => []];
 		});
 	}
@@ -96,17 +96,17 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchObjects(string $className = 'stdClass', $callback = null): array {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($className, $callback) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($className, $callback) {
 			$data = $statement->fetchAll(PDO::FETCH_CLASS, $className);
-			if($this->preserveTypes) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				$data = array_map(static function ($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
+				$data = array_map(static function($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
 			}
-			if($callback !== null) {
-				return call_user_func(static function ($resultData = []) use ($data, $callback) {
-					foreach($data as $row) {
+			if ($callback !== null) {
+				return call_user_func(static 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;
@@ -123,7 +123,7 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchObjectsLazy($className = null, $callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
+		$callback = $callback ?? (static function($row) { return $row; });
 		yield from $this->fetchLazy($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName);
 	}
 
@@ -131,8 +131,8 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchObject($className = null, $callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static function ($row) {
+		$callback = $callback ?? (static function($row) { return $row; });
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static function($row) {
 			return ['valid' => is_object($row), 'default' => null];
 		});
 	}
@@ -141,11 +141,11 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchKeyValue($treatValueAsArray = false): array {
-		return $this->createTempStatement(static function (QueryStatement $statement) use ($treatValueAsArray) {
-			if($treatValueAsArray) {
+		return $this->createTempStatement(static function(QueryStatement $statement) use ($treatValueAsArray) {
+			if ($treatValueAsArray) {
 				$rows = $statement->fetchAll(PDO::FETCH_ASSOC);
 				$result = [];
-				foreach($rows as $row) {
+				foreach ($rows as $row) {
 					[$key] = array_values($row);
 					$result[$key] = $row;
 				}
@@ -161,12 +161,12 @@ 
 	public function fetchGroups(array $fields): array {
 		$rows = $this->fetchRows();
 		$result = [];
-		foreach($rows as $row) {
+		foreach ($rows as $row) {
 			/** @var array<string, mixed> $tmp */
 			$tmp = &$result;
-			foreach($fields as $field) {
+			foreach ($fields as $field) {
 				$value = (string) $row[$field];
-				if(!array_key_exists($value, $tmp)) {
+				if (!array_key_exists($value, $tmp)) {
 					$tmp[$value] = [];
 				}
 				$tmp = &$tmp[$value];
@@ -180,8 +180,8 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchArray(?callable $fn = null): array {
-		return $this->createTempStatement(static function (QueryStatement $stmt) use ($fn) {
-			if($fn !== null) {
+		return $this->createTempStatement(static function(QueryStatement $stmt) use ($fn) {
+			if ($fn !== null) {
 				return $stmt->fetchAll(PDO::FETCH_FUNC, $fn);
 			}
 			return $stmt->fetchAll(PDO::FETCH_COLUMN);
@@ -192,9 +192,9 @@ 
 	 * @inheritDoc
 	 */
 	public function fetchValue($default = null, ?callable $fn = null) {
-		return $this->createTempStatement(static function (QueryStatement $stmt) use ($default, $fn) {
+		return $this->createTempStatement(static function(QueryStatement $stmt) use ($default, $fn) {
 			$result = $stmt->fetchAll(PDO::FETCH_COLUMN);
-			if($result !== false && array_key_exists(0, $result)) {
+			if ($result !== false && array_key_exists(0, $result)) {
 				return $fn !== null ? $fn($result[0]) : $result[0];
 			}
 			return $default;
@@ -229,7 +229,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;
@@ -249,21 +249,21 @@ 
 	 * @return array<string, mixed>[]
 	 */
 	private function fetchAll($callback = null, int $mode = 0, $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);
-				$data = array_map(static function ($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
+				$data = array_map(static function($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
 			}
-			if($callback !== null) {
-				return call_user_func(static function ($resultData = []) use ($data, $callback) {
-					foreach($data as $row) {
+			if ($callback !== null) {
+				return call_user_func(static function($resultData = []) use ($data, $callback) {
+					foreach ($data as $row) {
 						$result = $callback($row);
-						if($result instanceof DBIgnoreRow) {
+						if ($result instanceof DBIgnoreRow) {
 							continue;
 						}
-						if($result !== null) {
+						if ($result !== null) {
 							$resultData[] = $result;
 						} else {
 							$resultData[] = $row;
@@ -288,18 +288,18 @@ 
 		$statement = $this->createStatement();
 		$statement->setFetchMode($mode, $arg0);
 		try {
-			while($row = $statement->fetch()) {
+			while ($row = $statement->fetch()) {
 				/** @var T $row */
 //				if($this->preserveTypes) {
 //					$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 //					$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 //				}
 				$result = $callback($row);
-				if($result instanceof DBIgnoreRow) {
+				if ($result instanceof DBIgnoreRow) {
 					// Skip row in this case
 					continue;
 				}
-				if($result !== null) {
+				if ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;
@@ -320,20 +320,20 @@ 
 	 * @return T|U|array<string, mixed>
 	 */
 	private function fetch($callback, int $mode = PDO::FETCH_ASSOC, $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 === null ? ['valid' => true] : $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;
 				}
 			}

src/Builder/Traits/TableNameBuilder.php

Spacing +10 added lines, -10 removed lines

@@ -14,34 +14,34 @@
 	 * @return string
 	 */
 	protected function buildTableName(?string $alias, $name): string {
-		if(is_object($name) && !($name instanceof VirtualTable) && method_exists($name, '__toString')) {
+		if (is_object($name) && !($name instanceof VirtualTable) && method_exists($name, '__toString')) {
 			$name = (string) $name;
 			$lines = explode("\n", $name);
-			$lines = array_map(static function (string $line) { return "\t{$line}"; }, $lines);
+			$lines = array_map(static function(string $line) { return "\t{$line}"; }, $lines);
 			$name = implode("\n", $lines);
-			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
+			$name = '('.trim(rtrim(trim($name), ';')).')';
 		}
-		if(is_array($name)) {
+		if (is_array($name)) {
 			$parts = [];
-			foreach($name as $index => $bucket) {
-				if(is_scalar($bucket) && ctype_digit((string) $index)) {
+			foreach ($name as $index => $bucket) {
+				if (is_scalar($bucket) && ctype_digit((string) $index)) {
 					$parts[] = "SELECT {$this->db()->quote($bucket)} AS {$this->db()->quoteField('value')}";
 				} else {
 					$values = [];
-					foreach($bucket as $field => $value) {
+					foreach ($bucket as $field => $value) {
 						$values[] = sprintf('%s AS %s', $this->db()->quote($value), $this->db()->quoteField($field));
 					}
 					$parts[] = sprintf("SELECT %s", implode(', ', $values));
 				}
 			}
-			$name = '(' . implode("\n\tUNION\n\t", $parts) . ')';
+			$name = '('.implode("\n\tUNION\n\t", $parts).')';
 		}
-		if((is_string($name) || $name instanceof VirtualTable) && $this->db()->getVirtualTables()->has($name)) {
+		if ((is_string($name) || $name instanceof VirtualTable) && $this->db()->getVirtualTables()->has($name)) {
 			$select = (string) $this->db()->getVirtualTables()->get($name);
 			$name = sprintf('(%s)', implode("\n\t", explode("\n", trim($select))));
 		}
 		$name = $this->aliasReplacer()->replace((string) $name);
-		if($alias !== null) {
+		if ($alias !== null) {
 			return sprintf("%s %s", $name, $alias);
 		}
 		return $name;

src/Builder/Traits/GroupByBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -14,9 +14,9 @@ 
 	 * @return $this
 	 */
 	public function groupBy(...$args) {
-		foreach($args as $expression) {
-			if(is_array($expression)) {
-				if(!count($expression)) {
+		foreach ($args as $expression) {
+			if (is_array($expression)) {
+				if (!count($expression)) {
 					continue;
 				}
 				$expression = $this->quoteExpr($expression[0], array_slice($expression, 1));
@@ -31,12 +31,12 @@ 
 	 * @return string
 	 */
 	protected function buildGroups(string $query): string {
-		if(!count($this->groupBy)) {
+		if (!count($this->groupBy)) {
 			return $query;
 		}
 		$query .= "GROUP BY\n";
 		$arr = [];
-		foreach($this->groupBy as $expression) {
+		foreach ($this->groupBy as $expression) {
 			$arr[] = "\t{$expression}";
 		}
 		return $query.implode(",\n", $arr)."\n";

src/Builder/Traits/HavingBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	 * @return $this
 	 */
 	public function having($expression, ...$args): self {
-		$fn = function ($expression, $args) { $this->having[] = [$expression, $args]; };
+		$fn = function($expression, $args) { $this->having[] = [$expression, $args]; };
 		ConditionAddHelper::addCondition($fn, $expression, $args);
 		return $this;
 	}

src/Builder/Traits/TableBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 	 */
 	protected function buildTables(string $query): string {
 		$arr = [];
-		foreach($this->tables as $table) {
+		foreach ($this->tables as $table) {
 			$arr[] = "\t".$this->buildTableName($table['alias'], $table['name']);
 		}
-		if(count($arr)) {
+		if (count($arr)) {
 			$query .= implode(",\n", $arr)."\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'): self {
-		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): self {
 		$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 [$expression, $direction]) {
+		foreach ($this->orderBy as [$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): void {
 		$direction = $this->fixDirection($direction);
-		if(is_array($expression)) {
-			if(count($expression) < 1) {
+		if (is_array($expression)) {
+			if (count($expression) < 1) {
 				return;
 			}
 			$expr = (string) $expression[0];

src/Builder/Traits/WhereBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	 * @return $this
 	 */
 	public function where($expression, ...$args): self {
-		$fn = function ($expression, $args) { $this->where[] = [$expression, $args]; };
+		$fn = function($expression, $args) { $this->where[] = [$expression, $args]; };
 		ConditionAddHelper::addCondition($fn, $expression, $args);
 		return $this;
 	}

src/Builder/InsertUpdateStatement.php

Spacing +3 added lines, -3 removed lines

@@ -31,13 +31,13 @@
 	 */
 	protected function buildFieldList(array $fields, array $query = []): array {
 		foreach ($fields as $fieldName => $fieldValue) {
-			if($fieldValue instanceof DefaultValue) {
+			if ($fieldValue instanceof DefaultValue) {
 				$fieldValue = 'DEFAULT';
 			}
-			if(is_array($this->mask) && !in_array($fieldName, $this->mask, true)) {
+			if (is_array($this->mask) && !in_array($fieldName, $this->mask, true)) {
 				continue;
 			}
-			if(is_int($fieldName)) {
+			if (is_int($fieldName)) {
 				if (is_array($fieldValue)) {
 					$fieldValue = $this->db()->quoteExpression($fieldValue[0], array_slice($fieldValue, 1));
 				}