rkrx / php-mysql-query-builder

src/Databases/MySQL/MySQLQuoter.php

Spacing +10 added lines, -10 removed lines

@@ -24,31 +24,31 @@ 
 	 * @return string
 	 */
 	public function quote($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)) {
+		if (is_array($value)) {
 			return implode(', ', array_map([$this, __FUNCTION__], $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;
 		}
 
-		if($value instanceof DateTimeInterface) {
+		if ($value instanceof DateTimeInterface) {
 			$value = date_create_immutable($value->format('c'))->setTimezone($this->timeZone)->format('Y-m-d H:i:s');
 		}
 
@@ -62,12 +62,12 @@ 
 	 */
 	public function quoteExpression(string $expression, array $arguments = []): string {
 		$index = -1;
-		$func = function () use ($arguments, &$index) {
+		$func = function() use ($arguments, &$index) {
 			$index++;
-			if(array_key_exists($index, $arguments)) {
+			if (array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = $this->quote($argument);
-			} elseif(count($arguments) > 0) {
+			} elseif (count($arguments) > 0) {
 				$args = $arguments;
 				$value = array_pop($args);
 				$value = $this->quote($value);

src/Databases/MySQL.php

Spacing +25 added lines, -25 removed lines

@@ -50,7 +50,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;
@@ -65,7 +65,7 @@ 
 		];
 		$this->options = array_merge($defaultOptions, $options);
 		$this->options['timezone'] = $this->options['timezone'] ?? date_default_timezone_get();
-		if(!($this->options['timezone'] instanceof DateTimeZone)) {
+		if (!($this->options['timezone'] instanceof DateTimeZone)) {
 			$this->options['timezone'] = new DateTimeZone((string) $this->options['timezone']);
 		}
 		$this->quoter = new MySQLQuoter($pdo, $this->options['timezone']);
@@ -89,7 +89,7 @@ 
 	 * @return VirtualTables
 	 */
 	public function getVirtualTables(): VirtualTables {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -101,7 +101,7 @@ 
 	 */
 	public function query(string $query) {
 		return $this->getQueryLoggers()->logRegion($query, function() use ($query) {
-			return $this->buildQueryStatement($query, function ($query) {
+			return $this->buildQueryStatement($query, function($query) {
 				return $this->pdo->query($query);
 			});
 		});
@@ -112,7 +112,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);
 		});
 	}
@@ -124,11 +124,11 @@ 
 	 */
 	public function exec(string $query, array $params = []): int {
 		return $this->getQueryLoggers()->logRegion($query, function() use ($query, $params) {
-			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;
@@ -150,19 +150,19 @@ 
 	 */
 	public function getTableFields(string $table): array {
 		$fqTable = $this->select()->aliasReplacer()->replace($table);
-		if(array_key_exists($fqTable, $this->tableFields)) {
+		if (array_key_exists($fqTable, $this->tableFields)) {
 			return $this->tableFields[$fqTable];
 		}
 		$query = "DESCRIBE {$fqTable}";
 		return $this->getQueryLoggers()->logRegion($query, function() use ($query, $fqTable) {
-			return $this->exceptionHandler(function () use ($query, $fqTable) {
+			return $this->exceptionHandler(function() use ($query, $fqTable) {
 				$stmt = $this->pdo->query($query);
 				try {
-					if($stmt === false) {
+					if ($stmt === false) {
 						throw new RuntimeException('Invalid return type');
 					}
 					$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-					$this->tableFields[$fqTable] = array_map(static function ($row) { return $row['Field']; }, $rows ?: []);
+					$this->tableFields[$fqTable] = array_map(static function($row) { return $row['Field']; }, $rows ?: []);
 					return $this->tableFields[$fqTable];
 				} finally {
 					try {
@@ -206,7 +206,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;
@@ -220,7 +220,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;
@@ -234,7 +234,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;
@@ -253,8 +253,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();
@@ -268,7 +268,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -277,7 +277,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -288,7 +288,7 @@ 
 	 * @return T
 	 */
 	public function dryRun(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return $callback($this);
@@ -313,7 +313,7 @@ 
 	 * @throws Throwable
 	 */
 	public function transaction(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = $callback($this);
@@ -321,7 +321,7 @@ 
 				return $result;
 			} catch (Throwable $e) {
 				// @phpstan-ignore-next-line; If condition is always false as it is not.
-				if($this->pdo->inTransaction()) {
+				if ($this->pdo->inTransaction()) {
 					$this->transactionRollback();
 				}
 				throw $e;
@@ -345,11 +345,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();
@@ -366,7 +366,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/Internal/ConditionBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -14,16 +14,16 @@ 
 	 * @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) {
+		foreach ($conditions as [$expression, $arguments]) {
+			if (is_array($expression)) {
+				foreach ($expression as $key => $value) {
 					$key = self::formatKey($key);
-					if($value === null) {
+					if ($value === null) {
 						$arr = self::buildCondition($arr, "ISNULL({$key})", [$value], $db);
 					} else {
 						$arr = self::buildCondition($arr, "{$key}=?", [$value], $db);
@@ -55,11 +55,11 @@ 
 	 * @return string
 	 */
 	private static function formatKey(string $key): string {
-		if(strpos($key, '`') !== false || strpos($key, '(') !== false) {
+		if (strpos($key, '`') !== false || strpos($key, '(') !== false) {
 			return $key;
 		}
 		$keyParts = explode('.', $key);
-		$fn = static function (string $part) {
+		$fn = static function(string $part) {
 			return "`{$part}`";
 		};
 		$enclosedKeyParts = array_map($fn, $keyParts);

src/Databases/MySQL/MySQLRunnableSelect.php

Spacing +40 added lines, -40 removed lines

@@ -86,7 +86,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);
 	}
 
@@ -94,8 +94,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' => []];
 		});
 	}
@@ -104,17 +104,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;
@@ -131,7 +131,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);
 	}
 
@@ -139,8 +139,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];
 		});
 	}
@@ -149,11 +149,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;
 				}
@@ -169,12 +169,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];
@@ -188,8 +188,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);
@@ -200,9 +200,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;
@@ -237,7 +237,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;
@@ -259,21 +259,21 @@ 
 	 * @return ($callback is null ? array<int, ($mode is PDO::FETCH_NUM ? array<int, null|scalar> : array<string, null|scalar>)> : array<int, TFnReturnType|TFnParamType>)
 	 */
 	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;
@@ -298,18 +298,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;
@@ -330,20 +330,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/QueryStatement.php

Spacing +6 added lines, -6 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);
@@ -66,7 +66,7 @@ 
 		$this->exceptionHandler(function() use ($params) {
 			$this->queryLoggers->logRegion($this->query, function() use ($params) {
 				$response = $this->statement->execute($params);
-				if(!$response) {
+				if (!$response) {
 					throw new SqlException('Execution returned with "false".');
 				}
 			});
@@ -82,13 +82,13 @@ 
 	 */
 	public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null, array $ctorArgs = []): array {
 		$result = $x = $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);
 		});
 		/** @var array<mixed, mixed>|false $x */
-		if($x === false) {
+		if ($x === false) {
 			return [];
 		}
 		return $result;
@@ -141,7 +141,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;