rkrx / php-mysql-query-builder

src/Databases/MySQL.php

Spacing +31 added lines, -31 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param array $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;
@@ -75,7 +75,7 @@ 
 	 * @return VirtualTables
 	 */
 	public function getVirtualTables(): VirtualTables {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -86,7 +86,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);
 		});
 	}
@@ -96,7 +96,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);
 		});
 	}
@@ -107,11 +107,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;
@@ -132,12 +132,12 @@ 
 	 */
 	public function getTableFields(string $table): array {
 		$table = $this->select()->aliasReplacer()->replace($table);
-		if(array_key_exists($table, self::$tableFields)) {
+		if (array_key_exists($table, self::$tableFields)) {
 			return self::$tableFields[$table];
 		}
 		$stmt = $this->pdo->query("DESCRIBE {$table}");
 		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		self::$tableFields[$table] = array_map(static function ($row) { return $row['Field']; }, $rows);
+		self::$tableFields[$table] = array_map(static function($row) { return $row['Field']; }, $rows);
 		$stmt->closeCursor();
 		return self::$tableFields[$table];
 	}
@@ -149,12 +149,12 @@ 
 	 */
 	public function quoteExpression($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);
@@ -172,14 +172,14 @@ 
 	 * @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_array($value)) {
+			$result = implode(', ', array_map(function($value) { return $this->quote($value); }, $value));
 		} else {
 			$result = $this->pdo->quote($value);
 		}
@@ -194,7 +194,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);
@@ -209,7 +209,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;
@@ -223,7 +223,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;
@@ -237,7 +237,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;
@@ -256,8 +256,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();
@@ -271,7 +271,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -280,7 +280,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -290,7 +290,7 @@ 
 	 * @return mixed
 	 */
 	public function dryRun($callback = null) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return $callback($this);
@@ -314,14 +314,14 @@ 
 	 */
 	public function transaction(callable $callback = null) {
 		$result = null;
-		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;
@@ -345,11 +345,11 @@ 
 	 */
 	private function transactionEnd(callable $fn) {
 		$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();
@@ -365,7 +365,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/Tools/VirtualTables.php

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@
 	 * @return Select|null
 	 */
 	public function get($tableName): ?Select {
-		if($this->has($tableName)) {
+		if ($this->has($tableName)) {
 			$table = $this->virtualTables[(string) $tableName];
-			if($table instanceof Closure) {
-				if($tableName instanceof VirtualTable) {
+			if ($table instanceof Closure) {
+				if ($tableName instanceof VirtualTable) {
 					$params = $tableName->getParams();
 					return $table($params);
 				}

src/Builder/Internal/ConditionBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -12,15 +12,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 list($expression, $arguments)) {
-			if(is_array($expression)) {
-				foreach($expression as $key => $value) {
-					if($value === null) {
+		foreach ($conditions as list($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/RunnableSelect.php

Spacing +24 added lines, -24 removed lines

@@ -92,7 +92,7 @@ 
 	 * @return mixed[]
 	 */
 	public function fetchRow(Closure $callback = null): array {
-		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static function ($row) {
+		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static function($row) {
 			return ['valid' => is_array($row), 'default' => []];
 		});
 	}
@@ -121,7 +121,7 @@ 
 	 * @return object[]
 	 */
 	public function fetchObject($className = null, Closure $callback = null): array {
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static function ($row) {
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static function($row) {
 			return ['valid' => is_object($row), 'default' => null];
 		});
 	}
@@ -131,11 +131,11 @@ 
 	 * @return mixed[]
 	 */
 	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) {
 					list($key) = array_values($row);
 					$result[$key] = $row;
 				}
@@ -152,12 +152,12 @@ 
 	public function fetchGroups(array $fields): array {
 		$rows = $this->fetchRows();
 		$result = [];
-		foreach($rows as $row) {
+		foreach ($rows as $row) {
 			/** @var array $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];
@@ -171,7 +171,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray(): array {
-		return $this->createTempStatement(static function (QueryStatement $stmt) {
+		return $this->createTempStatement(static function(QueryStatement $stmt) {
 			return $stmt->fetchAll(PDO::FETCH_COLUMN);
 		});
 	}
@@ -181,9 +181,9 @@ 
 	 * @return null|bool|string|int|float
 	 */
 	public function fetchValue($default = null) {
-		return $this->createTempStatement(static function (QueryStatement $stmt) use ($default) {
+		return $this->createTempStatement(static function(QueryStatement $stmt) use ($default) {
 			$result = $stmt->fetch(PDO::FETCH_NUM);
-			if($result !== false) {
+			if ($result !== false) {
 				return $result[0];
 			}
 			return $default;
@@ -218,7 +218,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;
@@ -240,18 +240,18 @@ 
 	 * @return mixed
 	 */
 	private function fetchAll(Closure $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 !== null && !($result instanceof DBIgnoreRow)) {
+						if ($result !== null && !($result instanceof DBIgnoreRow)) {
 							$resultData[] = $result;
 						} else {
 							$resultData[] = $row;
@@ -285,20 +285,20 @@ 
 	 * @return mixed
 	 */
 	private function fetch(Closure $callback = null, 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($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/Insert.php

Spacing +15 added lines, -15 removed lines

@@ -86,7 +86,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;
@@ -100,7 +100,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;
@@ -114,7 +114,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 {
@@ -131,7 +131,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;
@@ -144,7 +144,7 @@ 
 	 * @return $this
 	 */
 	public function updateAll(array $data, array $mask = null, array $excludeFields = null) {
-		$this->addAllTo($data, $mask, $excludeFields, function ($field, $value) {
+		$this->addAllTo($data, $mask, $excludeFields, function($field, $value) {
 			if ($field !== $this->keyField) {
 				$this->update($field, $value);
 			}
@@ -187,7 +187,7 @@ 
 		$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;
@@ -201,7 +201,7 @@ 
 		}
 
 		$updateData = $this->buildUpdate();
-		if($updateData) {
+		if ($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
@@ -232,12 +232,12 @@ 
 	 * @return $this
 	 */
 	private function addAllTo(array $data, ?array $mask = null, ?array $excludeFields = null, $fn = null) {
-		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]);
 				}
 			}
@@ -254,10 +254,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);
@@ -280,7 +280,7 @@ 
 	 * @return array
 	 */
 	private function clearValues(array $values): array {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -289,7 +289,7 @@ 
 		$result = [];
 
 		foreach ($values as $fieldName => $fieldValue) {
-			if(in_array($fieldName, $fields)) {
+			if (in_array($fieldName, $fields)) {
 				$result[$fieldName] = $fieldValue;
 			}
 		}

src/Builder/Expr/DBExprFilter.php

Spacing +11 added lines, -11 removed lines

@@ -27,16 +27,16 @@ 
 		$this->value = $data;
 		$this->keyPath = $this->buildKey($keyPath);
 		$this->value = $this->recursiveGet($data, $this->keyPath, null);
-		if($validator === null) {
-			$validator = function ($data) {
-				if(is_array($data)) {
+		if ($validator === null) {
+			$validator = function($data) {
+				if (is_array($data)) {
 					return $this->isValidArray($data);
 				}
 				return (string) $data !== '';
 			};
 		}
-		if($validationResultHandler === null) {
-			$validationResultHandler = static function () {};
+		if ($validationResultHandler === null) {
+			$validationResultHandler = static function() {};
 		}
 		$this->validator = $validator;
 		$this->validationResultHandler = $validationResultHandler;
@@ -73,10 +73,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;
@@ -87,8 +87,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 !== '';
@@ -107,9 +107,9 @@ 
 		if (!$count) {
 			return $default;
 		}
-		foreach($path as $idxValue) {
+		foreach ($path as $idxValue) {
 			$part = $idxValue;
-			if(!array_key_exists($part, $array)) {
+			if (!array_key_exists($part, $array)) {
 				return $default;
 			}
 			$array = $array[$part];

src/Builder/Expr/RequiredDBFilterMap.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 	 * @return DBExprFilter
 	 */
 	public function __invoke(string $expression, $keyPath, $validator = null) {
-		return new DBExprFilter($expression, $this->map, $keyPath, $validator, static function ($result, array $data) {
-			if(!$result) {
+		return new DBExprFilter($expression, $this->map, $keyPath, $validator, static function($result, array $data) {
+			if (!$result) {
 				throw new RequiredValueNotFoundException(sprintf("Required value %s not found", $data['key']));
 			}
 		});

src/Builder/Expr/DBExprOrderBySpec.php

Spacing +5 added lines, -5 removed lines

@@ -11,16 +11,16 @@
 	 */
 	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) && array_key_exists($sortFieldSpec[0], $expressions)) {
+		foreach ($sortFieldsSpec as $sortFieldSpec) {
+			if (array_key_exists(0, $sortFieldSpec) && 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[] = [

src/Builder/Helpers/LazyRowGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@
 	 * @return Generator|mixed[]
 	 */
 	public function generate(QueryStatement $statement, Closure $callback = null) {
-		while($row = $statement->fetch()) {
-			if($this->preserveTypes) {
+		while ($row = $statement->fetch()) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 			}
-			if($callback !== null) {
+			if ($callback !== null) {
 				$result = $callback($row);
-				if($result instanceof DBIgnoreRow) {
+				if ($result instanceof DBIgnoreRow) {
 					// Do nothing in this case
 					continue;
-				} elseif($result !== null) {
+				} elseif ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;