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/Helpers/FieldTypeProvider.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	 */
 	public static function getFieldTypes(QueryStatement $statement): array {
 		$fieldTypes = [];
-		for($i = 0; $column = $statement->getColumnMeta($i); $i++) {
+		for ($i = 0; $column = $statement->getColumnMeta($i); $i++) {
 			$fieldTypes[(string) $column['name']] = self::getTypeFromNativeType($column['native_type']);
 		}
 		return $fieldTypes;

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/Internal/DDLRunnable.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	public function run(array $params = []) {
 		$this->query->execute($params);
 		$response = $this->query->getStatement()->rowCount();
-		if($this->callbackFn !== null) {
+		if ($this->callbackFn !== null) {
 			$response = call_user_func($this->callbackFn);
 		}
 		return $response;

src/Builder/Insert.php

Spacing +21 added lines, -21 removed lines

@@ -88,7 +88,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;
@@ -102,7 +102,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;
@@ -116,7 +116,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 {
@@ -133,7 +133,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;
@@ -146,8 +146,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);
 			}
 		});
@@ -191,7 +191,7 @@ 
 	 * @return string
 	 */
 	public function __toString(): string {
-		if($this->table === null) {
+		if ($this->table === null) {
 			throw new RuntimeException('Specify a table-name');
 		}
 
@@ -201,21 +201,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";
 		}
 
@@ -229,7 +229,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;
@@ -245,18 +245,18 @@ 
 	 * @param callable(string, mixed): void $fn
 	 */
 	private function addAllTo(array $data, ?array $mask, ?array $excludeFields, callable $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);
 		}
 	}
@@ -266,10 +266,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);
@@ -292,7 +292,7 @@ 
 	 * @return array<string, mixed>
 	 */
 	private function clearValues(array $values): array {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -300,8 +300,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;
 			}
 		}

src/Builder/Select.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +33 added lines, -33 removed lines

@@ -42,7 +42,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;
@@ -76,7 +76,7 @@ 
 	 * @return VirtualTables
 	 */
 	public function getVirtualTables(): VirtualTables {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -87,7 +87,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);
 		});
 	}
@@ -97,7 +97,7 @@ 
 	 * @return QueryStatement
 	 */
 	public function prepare(string $query) {
-		return $this->buildQueryStatement($query, function ($query) {
+		return $this->buildQueryStatement($query, function($query) {
 			return $this->pdo->prepare($query);
 		});
 	}
@@ -108,11 +108,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;
@@ -133,15 +133,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];
 	}
@@ -153,12 +153,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);
@@ -176,15 +176,15 @@ 
 	 * @return string
 	 */
 	public function quote($value): string {
-		if(is_null($value)) {
+		if (is_null($value)) {
 			$result = 'NULL';
-		} elseif($value instanceof Builder\DBExpr) {
+		} elseif ($value instanceof Builder\DBExpr) {
 			$result = $value->getExpression();
-		} elseif($value instanceof Builder\Select) {
+		} elseif ($value instanceof Builder\Select) {
 			$result = sprintf('(%s)', (string) $value);
-		} elseif(is_array($value)) {
-			$result = implode(', ', array_map(function ($value) { return $this->quote($value); }, $value));
-		} elseif(is_int($value) || is_float($value)) {
+		} elseif (is_array($value)) {
+			$result = implode(', ', array_map(function($value) { return $this->quote($value); }, $value));
+		} elseif (is_int($value) || is_float($value)) {
 			$result = (string) $value;
 		} else {
 			$result = $this->pdo->quote($value);
@@ -200,7 +200,7 @@ 
 		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);
@@ -215,7 +215,7 @@ 
 		$select = array_key_exists('select-factory', $this->options)
 			? call_user_func($this->options['select-factory'], $this, $this->options['select-options'])
 			: new Builder\RunnableSelect($this, $this->options['select-options']);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$select->fields($fields);
 		}
 		return $select;
@@ -229,7 +229,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;
@@ -243,7 +243,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;
@@ -262,8 +262,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();
@@ -277,7 +277,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -286,7 +286,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -297,7 +297,7 @@ 
 	 * @return T
 	 */
 	public function dryRun(callable $callback) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return $callback($this);
@@ -322,14 +322,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;
@@ -353,11 +353,11 @@ 
 	 */
 	private function transactionEnd(callable $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();
@@ -374,7 +374,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);