rkrx / php-mysql-query-builder

src/Builder/Helpers/FieldValueConverter.php

Spacing +2 added lines, -2 removed lines

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

src/Builder/Internal/ConditionBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -13,15 +13,15 @@
 	 * @return string
 	 */
 	public static function build(Database $db, string $query, array $conditions, string $token): string {
-		if(!count($conditions)) {
+		if (!count($conditions)) {
 			return $query;
 		}
 		$query .= "{$token}\n";
 		$arr = [];
-		foreach($conditions as [$expression, $arguments]) {
-			if(is_array($expression)) {
-				foreach($expression as $key => $value) {
-					if($value === null) {
+		foreach ($conditions as [$expression, $arguments]) {
+			if (is_array($expression)) {
+				foreach ($expression as $key => $value) {
+					if ($value === null) {
 						$arr = self::buildCondition($arr, "ISNULL(`{$key}`)", [$value], $db);
 					} else {
 						$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);

src/Builder/Update.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return $this
 	 */
 	public function table(string $alias, $table = null): self {
-		if($table === null) {
+		if ($table === null) {
 			[$alias, $table] = [$table, $alias];
 		}
 		$this->addTable($alias, $table);
@@ -64,7 +64,7 @@ 
 	 * @return $this
 	 */
 	public function setExpr(string $expr, ...$args): self {
-		if(count($args) > 0) {
+		if (count($args) > 0) {
 			$this->fields[] = func_get_args();
 		} else {
 			$this->fields[] = $expr;
@@ -78,15 +78,15 @@ 
 	 * @return $this
 	 */
 	public function setAll(array $data, array $allowedFields = null): self {
-		if($allowedFields !== null) {
-			foreach($data as $fieldName => $value) {
-				if(in_array($fieldName, $allowedFields)) {
+		if ($allowedFields !== null) {
+			foreach ($data as $fieldName => $value) {
+				if (in_array($fieldName, $allowedFields)) {
 					$this->set($fieldName, $value);
 				}
 			}
 		} else {
 			$values = $this->clearValues($data);
-			foreach($values as $fieldName => $value) {
+			foreach ($values as $fieldName => $value) {
 				$this->set($fieldName, $value);
 			}
 		}
@@ -121,7 +121,7 @@ 
 	 */
 	private function buildAssignments(string $query): string {
 		$sqlFields = $this->buildFieldList($this->fields);
-		if(!count($sqlFields)) {
+		if (!count($sqlFields)) {
 			throw new RuntimeException('No field-data found');
 		}
 		return sprintf("%s%s\n", $query, implode(",\n", $sqlFields));
@@ -132,14 +132,14 @@ 
 	 * @return array<string, mixed>
 	 */
 	private function clearValues(array $values): array {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 		$tables = $this->getTables();
-		if(!count($tables)) {
+		if (!count($tables)) {
 			throw new RuntimeException('Table name is missing');
 		}
-		if(count($tables) > 1) {
+		if (count($tables) > 1) {
 			throw new RuntimeException('Batch values only work with max. one table');
 		}
 
@@ -147,11 +147,11 @@ 
 		$tableName = $table['name'];
 
 		$result = [];
-		if(is_string($tableName)) {
+		if (is_string($tableName)) {
 			$fields = $this->db()->getTableFields($tableName);
 
-			foreach($values as $fieldName => $fieldValue) {
-				if(in_array($fieldName, $fields, true)) {
+			foreach ($values as $fieldName => $fieldValue) {
+				if (in_array($fieldName, $fields, true)) {
 					$result[$fieldName] = $fieldValue;
 				}
 			}

src/Builder/Statement.php

Spacing +3 added lines, -3 removed lines

@@ -29,14 +29,14 @@
 	 * @return $this
 	 */
 	public function debug($stop = true) {
-		if(array_key_exists('debug_formatter', $this->options)) {
+		if (array_key_exists('debug_formatter', $this->options)) {
 			$this->options['debug_formatter']();
-		} elseif(PHP_SAPI === 'cli') {
+		} elseif (PHP_SAPI === 'cli') {
 			echo "\n{$this->__toString()}\n";
 		} else {
 			echo "<pre>{$this->__toString()}</pre>";
 		}
-		if($stop) {
+		if ($stop) {
 			exit;
 		}
 		return $this;

src/Databases/MySQL/MySQLRunnableSelect.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/Databases/MySQL/MySQLSelect.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	 * @return $this
 	 */
 	public function from(?string $alias, $table = null) {
-		if($table === null) {
+		if ($table === null) {
 			[$alias, $table] = [$table, $alias];
 			$this->addTable($alias, (string) $table);
 		} else {

src/Builder/Traits/HavingBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 * @return $this
 	 */
 	public function having($expression, ...$args) {
-		$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/WhereBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 * @return $this
 	 */
 	public function where($expression, ...$args) {
-		$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/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 [$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];