rkrx / php-mysql-query-builder

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];

src/Builder/QueryStatement.php

Spacing +5 added lines, -5 removed lines

@@ -47,10 +47,10 @@ 
 	 */
 	public function setFetchMode(int $mode = PDO::FETCH_ASSOC, $arg0 = null, ?array $arg1 = null) {
 		$args = [$mode];
-		if($arg0 !== null) {
+		if ($arg0 !== null) {
 			$args[] = $arg0;
 		}
-		if($arg1 !== null) {
+		if ($arg1 !== null) {
 			$args[] = $arg1;
 		}
 		$this->statement->setFetchMode(...$args);
@@ -67,7 +67,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".');
 			}
 		});
@@ -82,7 +82,7 @@ 
 	 */
 	public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null, array $ctorArgs = []): array {
 		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);
@@ -136,7 +136,7 @@ 
 	public function getColumnMeta(int $columnNo): ?array {
 		return $this->exceptionHandler(function() use ($columnNo) {
 			$columnMeta = $this->statement->getColumnMeta($columnNo);
-			if($columnMeta === false) {
+			if ($columnMeta === false) {
 				return null;
 			}
 			return $columnMeta;

src/Databases/MySQL/MySQLValueQuoter.php

Spacing +7 added lines, -7 removed lines

@@ -13,30 +13,30 @@
 	 * @return string
 	 */
 	public static function quote(PDO $pdo, $value): string {
-		if(is_null($value)) {
+		if (is_null($value)) {
 			return 'NULL';
 		}
 
-		if(is_bool($value)) {
+		if (is_bool($value)) {
 			return $value ? '1' : '0';
 		}
 
-		if(is_array($value)) {
-			$fn = static function ($value) use ($pdo) {
+		if (is_array($value)) {
+			$fn = static function($value) use ($pdo) {
 				return self::quote($pdo, $value);
 			};
 			return implode(', ', array_map($fn, $value));
 		}
 
-		if($value instanceof DBExpr) {
+		if ($value instanceof DBExpr) {
 			return $value->getExpression();
 		}
 
-		if($value instanceof Select) {
+		if ($value instanceof Select) {
 			return sprintf('(%s)', (string) $value);
 		}
 
-		if(is_int($value) || is_float($value)) {
+		if (is_int($value) || is_float($value)) {
 			return (string) $value;
 		}
 

src/Databases/MySQL/MySQLExpressionQuoter.php

Spacing +3 added lines, -3 removed lines

@@ -15,12 +15,12 @@
 	 */
 	public static function quoteExpression(PDO $pdo, string $expression, array $arguments = []): string {
 		$index = -1;
-		$func = static function () use ($pdo, $arguments, &$index) {
+		$func = static function() use ($pdo, $arguments, &$index) {
 			$index++;
-			if(array_key_exists($index, $arguments)) {
+			if (array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = MySQLValueQuoter::quote($pdo, $argument);
-			} elseif(count($arguments) > 0) {
+			} elseif (count($arguments) > 0) {
 				$args = $arguments;
 				$value = array_pop($args);
 				$value = MySQLValueQuoter::quote($pdo, $value);

src/Databases/MySQL/MySQLFieldQuoter.php

Spacing +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
 	 * @return string
 	 */
 	public static function quoteField(string $field): string {
-		if(is_numeric($field) || !is_string($field)) {
+		if (is_numeric($field) || !is_string($field)) {
 			throw new UnexpectedValueException('Field name is invalid');
 		}
-		if(strpos($field, '`') !== false) {
+		if (strpos($field, '`') !== false) {
 			return $field;
 		}
 		$parts = explode('.', $field);

src/Databases/MySQL.php

Spacing +23 added lines, -23 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param array<string, mixed> $options
 	 */
 	public function __construct(PDO $pdo, array $options = []) {
-		if($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) {
+		if ($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) {
 			$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 		}
 		$this->pdo = $pdo;
@@ -82,7 +82,7 @@ 
 	 * @return VirtualTables
 	 */
 	public function getVirtualTables(): VirtualTables {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -93,7 +93,7 @@ 
 	 * @return QueryStatement
 	 */
 	public function query(string $query) {
-		return $this->buildQueryStatement($query, function ($query) {
+		return $this->buildQueryStatement($query, function($query) {
 			return $this->pdo->query($query);
 		});
 	}
@@ -103,7 +103,7 @@ 
 	 * @return QueryStatement
 	 */
 	public function prepare(string $query) {
-		return $this->buildQueryStatement((string) $query, function ($query) {
+		return $this->buildQueryStatement((string) $query, function($query) {
 			return $this->pdo->prepare($query);
 		});
 	}
@@ -114,11 +114,11 @@ 
 	 * @return int
 	 */
 	public function exec(string $query, array $params = []): int {
-		return $this->exceptionHandler(function () use ($query, $params) {
+		return $this->exceptionHandler(function() use ($query, $params) {
 			$stmt = $this->pdo->prepare($query);
 			$timer = microtime(true);
 			$stmt->execute($params);
-			$this->queryLoggers->log($query, microtime(true) - $timer);
+			$this->queryLoggers->log($query, microtime(true)-$timer);
 			$result = $stmt->rowCount();
 			$stmt->closeCursor();
 			return $result;
@@ -139,15 +139,15 @@ 
 	 */
 	public function getTableFields(string $table): array {
 		$table = $this->select()->aliasReplacer()->replace($table);
-		if(array_key_exists($table, $this->tableFields)) {
+		if (array_key_exists($table, $this->tableFields)) {
 			return $this->tableFields[$table];
 		}
 		$stmt = $this->pdo->query("DESCRIBE {$table}");
-		if($stmt === false) {
+		if ($stmt === false) {
 			throw new RuntimeException('Invalid return type');
 		}
 		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		$this->tableFields[$table] = array_map(static function ($row) { return $row['Field']; }, $rows ?: []);
+		$this->tableFields[$table] = array_map(static function($row) { return $row['Field']; }, $rows ?: []);
 		$stmt->closeCursor();
 		return $this->tableFields[$table];
 	}
@@ -185,7 +185,7 @@ 
 		$select = array_key_exists('select-factory', $this->options)
 			? call_user_func($this->options['select-factory'], $this, $this->options['select-options'])
 			: new MySQL\MySQLRunnableSelect($this, $this->options['select-options']);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$select->fields($fields);
 		}
 		return $select;
@@ -199,7 +199,7 @@ 
 		$insert = array_key_exists('insert-factory', $this->options)
 			? call_user_func($this->options['insert-factory'], $this, $this->options['insert-options'])
 			: new Builder\RunnableInsert($this, $this->options['insert-options']);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$insert->addAll($fields);
 		}
 		return $insert;
@@ -213,7 +213,7 @@ 
 		$update = array_key_exists('update-factory', $this->options)
 			? call_user_func($this->options['update-factory'], $this, $this->options['update-options'])
 			: new Builder\RunnableUpdate($this, $this->options['update-options']);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$update->setAll($fields);
 		}
 		return $update;
@@ -232,8 +232,8 @@ 
 	 * @return $this
 	 */
 	public function transactionStart() {
-		if($this->transactionLevel === 0) {
-			if($this->pdo->inTransaction()) {
+		if ($this->transactionLevel === 0) {
+			if ($this->pdo->inTransaction()) {
 				$this->outerTransaction = true;
 			} else {
 				$this->pdo->beginTransaction();
@@ -247,7 +247,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -256,7 +256,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -267,7 +267,7 @@ 
 	 * @return T
 	 */
 	public function dryRun(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return $callback($this);
@@ -292,14 +292,14 @@ 
 	 * @throws Throwable
 	 */
 	public function transaction(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = $callback($this);
 				$this->transactionCommit();
 				return $result;
 			} catch (Throwable $e) {
-				if($this->pdo->inTransaction()) {
+				if ($this->pdo->inTransaction()) {
 					$this->transactionRollback();
 				}
 				throw $e;
@@ -323,11 +323,11 @@ 
 	 */
 	private function transactionEnd($fn): self {
 		$this->transactionLevel--;
-		if($this->transactionLevel < 0) {
+		if ($this->transactionLevel < 0) {
 			throw new RuntimeException("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction");
 		}
-		if($this->transactionLevel < 1) {
-			if($this->outerTransaction) {
+		if ($this->transactionLevel < 1) {
+			if ($this->outerTransaction) {
 				$this->outerTransaction = false;
 			} else {
 				$fn();
@@ -344,7 +344,7 @@ 
 	 */
 	private function buildQueryStatement(string $query, callable $fn): QueryStatement {
 		$stmt = $fn($query);
-		if(!$stmt) {
+		if (!$stmt) {
 			throw new RuntimeException("Could not execute statement:\n{$query}");
 		}
 		return new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);

src/Builder/Expr/DBExprOrderBySpec.php

Spacing +8 added lines, -8 removed lines

@@ -14,17 +14,17 @@ 
 	 */
 	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)) {
-				if(array_key_exists($sortFieldSpec[0], $expressions)) {
+		foreach ($sortFieldsSpec as $sortFieldSpec) {
+			if (array_key_exists(0, $sortFieldSpec)) {
+				if (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[] = [
@@ -33,9 +33,9 @@ 
 					];
 				}
 			} else { // @phpstan-ignore-line
-				foreach($sortFieldSpec as $alias => $direction) {
+				foreach ($sortFieldSpec as $alias => $direction) {
 					$direction = strtoupper($direction) === 'DESC' ? 'DESC' : 'ASC';
-					if(array_key_exists($alias, $expressions)) {
+					if (array_key_exists($alias, $expressions)) {
 						$this->fields[] = [$expressions[$alias], $direction];
 					}
 				}

src/Builder/Expr/RequiredDBFilterMap.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 * @return DBExprFilter
 	 */
 	public function __invoke(string $expression, $keyPath, $validator = null) {
-		if(!RecursiveStructureAccess::recursiveHas($this->map, $keyPath)) {
+		if (!RecursiveStructureAccess::recursiveHas($this->map, $keyPath)) {
 			throw new RequiredValueNotFoundException(sprintf("Required value %s not found", json_encode($keyPath, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)));
 		}
 		return new DBExprFilter($expression, $this->map, $keyPath, $validator);

src/Builder/Expr/DBOrderSpec.php

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
 	public function getFields(): array {
 		$fields = [];
 		$max = $this->options['max_sort_instructions'] ?? 16;
-		foreach($this->sortingInstruction as $alias => $direction) {
+		foreach ($this->sortingInstruction as $alias => $direction) {
 			$direction = strtolower($direction) === 'desc' ? 'DESC' : 'ASC';
-			if(!array_key_exists($alias, $this->sortSpecification)) {
+			if (!array_key_exists($alias, $this->sortSpecification)) {
 				throw new DBSortAliasNotFoundException('Sorting: Alias for DB-Expression not found');
 			}
 			$fields[] = [$this->sortSpecification[$alias], $direction];
-			if($max < 1) {
+			if ($max < 1) {
 				throw new DBSortTooManyInstructionsException();
 			}
 			$max--;