rkrx / php-mysql-query-builder

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/DBExprFilter.php

Spacing +9 added lines, -9 removed lines

@@ -30,14 +30,14 @@ 
 		$this->keyPath = $this->buildKey($keyPath);
 		$this->hasValue = RecursiveStructureAccess::recursiveHas($data, $this->keyPath);
 		$this->value = RecursiveStructureAccess::recursiveGet($data, $this->keyPath, null);
-		if($validator === null) {
+		if ($validator === null) {
 			$validator = function() {
 				return true;
 			};
 		}
 		$this->validator = $validator;
-		if($validationResultHandler === null) {
-			$validationResultHandler = static function () {};
+		if ($validationResultHandler === null) {
+			$validationResultHandler = static function() {};
 		}
 		$this->validationResultHandler = $validationResultHandler;
 	}
@@ -53,10 +53,10 @@ 
 	 * @return bool
 	 */
 	public function isValid(): bool {
-		if(!$this->hasValue) {
+		if (!$this->hasValue) {
 			return false;
 		}
-		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,
@@ -79,10 +79,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;
@@ -93,8 +93,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 !== '';

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

src/Builder/Helpers/RecursiveStructureAccess.php

Spacing +10 added lines, -10 removed lines

@@ -28,9 +28,9 @@ 
 		if (!$count) {
 			return $default;
 		}
-		foreach($arrayPath as $idxValue) {
+		foreach ($arrayPath as $idxValue) {
 			$part = $idxValue;
-			if(!array_key_exists($part, $data)) {
+			if (!array_key_exists($part, $data)) {
 				return $default;
 			}
 			$data = $data[$part];
@@ -45,14 +45,14 @@ 
 	 */
 	private static function _recursiveHas($structure, array $path): bool {
 		$data = self::ensureArrayIsArray($structure);
-		if($data === null) {
+		if ($data === null) {
 			return false;
 		}
-		if(!count($path)) {
+		if (!count($path)) {
 			return false;
 		}
 		$key = array_shift($path);
-		if(count($path)) {
+		if (count($path)) {
 			return self::_recursiveHas($data[$key] ?? null, $path);
 		}
 		return array_key_exists($key, $data);
@@ -63,11 +63,11 @@ 
 	 * @return array<int, string>
 	 */
 	private static function getArrayPath($path): array {
-		if(is_array($path)) {
+		if (is_array($path)) {
 			return $path;
 		}
 		$parts = preg_split('{(?<!\\x5C)(?:\\x5C\\x5C)*\\.}', $path);
-		if($parts === false) {
+		if ($parts === false) {
 			return [$path];
 		}
 		return $parts;
@@ -78,13 +78,13 @@ 
 	 * @return array<mixed, mixed>
 	 */
 	private static function ensureArrayIsArray($array): ?array {
-		if($array instanceof ArrayObject) {
+		if ($array instanceof ArrayObject) {
 			return $array->getArrayCopy();
 		}
-		if(is_object($array)) {
+		if (is_object($array)) {
 			return (array) $array;
 		}
-		if(is_array($array)) {
+		if (is_array($array)) {
 			return $array;
 		}
 		return null;

src/Builder/Value/DBOptionalValue.php

Spacing +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 	 * @return bool
 	 */
 	public function isValid(): bool {
-		if(!RecursiveStructureAccess::recursiveHas($this->data, $this->path)) {
+		if (!RecursiveStructureAccess::recursiveHas($this->data, $this->path)) {
 			return false;
 		}
-		if($this->validator !== null) {
+		if ($this->validator !== null) {
 			$value = $this->getValue();
 			return call_user_func($this->validator, $value);
 		}

src/Builder/Traits/OffsetBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
 	 * @return null|int
 	 */
 	protected function getOffset(): ?int {
-		if($this->offset instanceof OptionalValue) {
+		if ($this->offset instanceof OptionalValue) {
 			return $this->offset->getValue();
 		}
 		return $this->offset;
@@ -33,15 +33,15 @@ 
 	 */
 	protected function buildOffset(string $query): string {
 		$offset = $this->getOffset();
-		if($this->offset instanceof OptionalValue) {
-			if($this->offset->isValid()) {
+		if ($this->offset instanceof OptionalValue) {
+			if ($this->offset->isValid()) {
 				$value = $this->offset->getValue();
-				if(!preg_match('{\\d+}', $value)) {
+				if (!preg_match('{\\d+}', $value)) {
 					throw new InvalidValueException('Value for OFFSET has to be a number');
 				}
 				$query .= "OFFSET\n\t{$this->offset->getValue()}\n";
 			}
-		} elseif($offset !== null) {
+		} elseif ($offset !== null) {
 			$query .= "OFFSET\n\t{$this->offset}\n";
 		}
 		return $query;

src/Builder/Traits/LimitBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 	 * @return null|int
 	 */
 	protected function getLimit(): ?int {
-		if($this->limit instanceof OptionalValue) {
+		if ($this->limit instanceof OptionalValue) {
 			return $this->limit->getValue();
 		}
 		return $this->limit;
@@ -34,18 +34,18 @@ 
 	 */
 	protected function buildLimit(string $query, ?int $offset = null) {
 		$limit = $this->getLimit();
-		if($limit === null && $offset !== null) {
+		if ($limit === null && $offset !== null) {
 			$limit = '18446744073709551615';
 		}
-		if($this->limit instanceof OptionalValue) {
-			if($this->limit->isValid()) {
+		if ($this->limit instanceof OptionalValue) {
+			if ($this->limit->isValid()) {
 				$value = $this->limit->getValue();
-				if(!preg_match('{\\d+}', $value)) {
+				if (!preg_match('{\\d+}', $value)) {
 					throw new InvalidValueException('Value for LIMIT has to be a number');
 				}
 				$query .= "LIMIT\n\t{$this->limit->getValue()}\n";
 			}
-		} elseif($limit !== null) {
+		} elseif ($limit !== null) {
 			$query .= "LIMIT\n\t{$limit}\n";
 		}
 		return $query;