rkrx / php-mysql-query-builder

src/Databases/MySQL/MySQLRunnableSelect.php

Spacing +32 added lines, -32 removed lines

@@ -101,17 +101,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 fn($row) => 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;
@@ -147,11 +147,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;
 				}
@@ -167,12 +167,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];
@@ -186,8 +186,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);
@@ -198,9 +198,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;
@@ -235,7 +235,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;
@@ -256,21 +256,21 @@ 
 	 * @return ($callback is null ? array<int, ($mode is PDO::FETCH_NUM ? array<int, null|scalar> : array<string, null|scalar>)> : array<int, TFnReturnType>)
 	 */
 	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 fn($row) => 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;
@@ -294,18 +294,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;
@@ -326,20 +326,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/MySQLQuoter.php

Spacing +10 added lines, -10 removed lines

@@ -19,31 +19,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 = (new DateTimeImmutable($value->format('c')))->setTimezone($this->timeZone)->format('Y-m-d H:i:s');
 		}
 
@@ -57,12 +57,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 +24 added lines, -24 removed lines

@@ -52,7 +52,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;
@@ -67,7 +67,7 @@ 
 		];
 		$this->options = array_merge($defaultOptions, $options);
 		$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']);
@@ -91,7 +91,7 @@ 
 	 * @return VirtualTables
 	 */
 	public function getVirtualTables(): VirtualTables {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -136,11 +136,11 @@ 
 		array $params = []
 	): int {
 		return $this->getQueryLoggers()->logRegion($query, fn() =>
-			$this->exceptionHandler(function () use ($query, $params) {
+			$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;
@@ -154,7 +154,7 @@ 
 	 */
 	public function getLastInsertId(?string $name = null): ?string {
 		$result = $this->pdo->lastInsertId();
-		if($result === false) {
+		if ($result === false) {
 			return null;
 		}
 		return $result;
@@ -166,15 +166,15 @@ 
 	 */
 	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, fn() =>
-			$this->exceptionHandler(function () use ($query, $fqTable) {
+			$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);
@@ -182,7 +182,7 @@ 
 					return $this->tableFields[$fqTable];
 				} finally {
 					try {
-						if($stmt instanceof PDOStatement) {
+						if ($stmt instanceof PDOStatement) {
 							$stmt->closeCursor();
 						}
 					} catch (Throwable $e) {}
@@ -224,7 +224,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;
@@ -238,7 +238,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;
@@ -252,7 +252,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;
@@ -271,8 +271,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();
@@ -286,7 +286,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -295,7 +295,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -306,7 +306,7 @@ 
 	 * @return T
 	 */
 	public function dryRun(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return $callback($this);
@@ -331,14 +331,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;
@@ -362,11 +362,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();
@@ -383,7 +383,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/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/Insert.php

Spacing +21 added lines, -21 removed lines

@@ -89,7 +89,7 @@ 
 	 * @return $this
 	 */
 	public function addExpr(string $str, ...$args) {
-		if(count($args) > 0) {
+		if (count($args) > 0) {
 			$this->fields[] = func_get_args();
 		} else {
 			$this->fields[] = $str;
@@ -103,7 +103,7 @@ 
 	 * @return $this
 	 */
 	public function updateExpr(string $str, ...$args) {
-		if(count($args) > 0) {
+		if (count($args) > 0) {
 			$this->update[] = func_get_args();
 		} else {
 			$this->update[] = $str;
@@ -117,7 +117,7 @@ 
 	 * @return $this
 	 */
 	public function addOrUpdateExpr(string $expr, ...$args) {
-		if(count($args) > 0) {
+		if (count($args) > 0) {
 			$this->fields[] = func_get_args();
 			$this->update[] = func_get_args();
 		} else {
@@ -134,7 +134,7 @@ 
 	 * @return $this
 	 */
 	public function addAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
-		$this->addAllTo($data, $mask, $excludeFields, function ($field, $value) {
+		$this->addAllTo($data, $mask, $excludeFields, function($field, $value) {
 			$this->add($field, $value);
 		});
 		return $this;
@@ -147,8 +147,8 @@ 
 	 * @return $this
 	 */
 	public function updateAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
-		$this->addAllTo($data, $mask, $excludeFields, function ($field, $value) {
-			if($field !== $this->keyField) {
+		$this->addAllTo($data, $mask, $excludeFields, function($field, $value) {
+			if ($field !== $this->keyField) {
 				$this->update($field, $value);
 			}
 		});
@@ -192,7 +192,7 @@ 
 	 * @return string
 	 */
 	public function __toString(): string {
-		if($this->table === null) {
+		if ($this->table === null) {
 			throw new RuntimeException('Specify a table-name');
 		}
 
@@ -202,21 +202,21 @@ 
 		$ignoreStr = $this->ignore ? ' IGNORE' : '';
 		$queryArr[] = "INSERT{$ignoreStr} INTO\n\t{$tableName}\n";
 
-		if($this->from !== null) {
+		if ($this->from !== null) {
 			$fields = $this->from->getFields();
 			$queryArr[] = sprintf("\t(%s)\n", implode(', ', array_keys($fields)));
 			$queryArr[] = $this->from;
 		} else {
 			$fields = $this->fields;
 			$insertData = $this->buildFieldList($fields);
-			if(!count($insertData)) {
+			if (!count($insertData)) {
 				throw new RuntimeException('No field-data found');
 			}
 			$queryArr[] = sprintf("SET\n%s\n", implode(",\n", $insertData));
 		}
 
 		$updateData = $this->buildUpdate();
-		if($updateData) {
+		if ($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
@@ -230,7 +230,7 @@ 
 	 * @return array<string|int, mixed>
 	 */
 	private function addTo(array $fields, string $field, $value): array {
-		if(!$this->isFieldNameValid($field)) {
+		if (!$this->isFieldNameValid($field)) {
 			throw new UnexpectedValueException('Field name is invalid');
 		}
 		$sqlField = $field;
@@ -246,18 +246,18 @@ 
 	 * @param callable(string, mixed): void $fn
 	 */
 	private function addAllTo(array $data, ?array $mask, ?array $excludeFields, $fn): void {
-		if($mask !== null) {
+		if ($mask !== null) {
 			$data = array_intersect_key($data, array_combine($mask, $mask));
 		}
-		if($excludeFields !== null) {
-			foreach($excludeFields as $excludeField) {
-				if(array_key_exists($excludeField, $data)) {
+		if ($excludeFields !== null) {
+			foreach ($excludeFields as $excludeField) {
+				if (array_key_exists($excludeField, $data)) {
 					unset($data[$excludeField]);
 				}
 			}
 		}
 		$data = $this->clearValues($data);
-		foreach($data as $field => $value) {
+		foreach ($data as $field => $value) {
 			$fn($field, $value);
 		}
 	}
@@ -267,10 +267,10 @@ 
 	 */
 	private function buildUpdate(): string {
 		$queryArr = [];
-		if(!empty($this->update)) {
+		if (!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = [];
-			if($this->keyField !== null) {
+			if ($this->keyField !== null) {
 				$updateArr[] = "\t`{$this->keyField}` = LAST_INSERT_ID({$this->keyField})";
 			}
 			$updateArr = $this->buildFieldList($this->update, $updateArr);
@@ -293,7 +293,7 @@ 
 	 * @return array<string, mixed>
 	 */
 	private function clearValues(array $values): array {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -301,8 +301,8 @@ 
 		$fields = $this->db()->getTableFields($tableName);
 		$result = [];
 
-		foreach($values as $fieldName => $fieldValue) {
-			if(in_array($fieldName, $fields)) {
+		foreach ($values as $fieldName => $fieldValue) {
+			if (in_array($fieldName, $fields)) {
 				$result[$fieldName] = $fieldValue;
 			}
 		}