rkrx / php-mysql-query-builder

src/Builder/Helpers/FieldTypeProvider.php

Spacing +1 added lines, -1 removed lines

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

src/Builder/RunnableSelect.php

Spacing +24 added lines, -24 removed lines

@@ -91,7 +91,7 @@ 
 	 * @return mixed[]
 	 */
 	public function fetchRow(Closure $callback = null) {
-		return $this->fetch($callback, PDO::FETCH_ASSOC, null, function ($row) {
+		return $this->fetch($callback, PDO::FETCH_ASSOC, null, function($row) {
 			return ['valid' => is_array($row), 'default' => []];
 		});
 	}
@@ -120,7 +120,7 @@ 
 	 * @return object[]
 	 */
 	public function fetchObject($className = null, Closure $callback = null) {
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, function ($row) {
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, function($row) {
 			return ['valid' => is_object($row), 'default' => null];
 		});
 	}
@@ -130,11 +130,11 @@ 
 	 * @return mixed[]
 	 */
 	public function fetchKeyValue($treatValueAsArray = false) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($treatValueAsArray) {
-			if($treatValueAsArray) {
+		return $this->createTempStatement(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;
 				}
@@ -151,11 +151,11 @@ 
 	public function fetchGroups(array $fields) {
 		$rows = $this->fetchRows();
 		$result = [];
-		foreach($rows as $row) {
+		foreach ($rows as $row) {
 			$tmp = &$result;
-			foreach($fields as $field) {
+			foreach ($fields as $field) {
 				$value = $row[$field];
-				if(!array_key_exists($value, $tmp)) {
+				if (!array_key_exists($value, $tmp)) {
 					$tmp[$value] = [];
 				}
 				$tmp = &$tmp[$value];
@@ -169,7 +169,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray() {
-		return $this->createTempStatement(function (QueryStatement $stmt) {
+		return $this->createTempStatement(function(QueryStatement $stmt) {
 			return $stmt->fetchAll(\PDO::FETCH_COLUMN);
 		});
 	}
@@ -179,9 +179,9 @@ 
 	 * @return null|bool|string|int|float
 	 */
 	public function fetchValue($default = null) {
-		return $this->createTempStatement(function (QueryStatement $stmt) use ($default) {
+		return $this->createTempStatement(function(QueryStatement $stmt) use ($default) {
 			$result = $stmt->fetch(\PDO::FETCH_NUM);
-			if($result !== false) {
+			if ($result !== false) {
 				return $result[0];
 			}
 			return $default;
@@ -219,7 +219,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;
@@ -239,20 +239,20 @@ 
 	 * @return mixed
 	 */
 	private function fetchAll(Closure $callback = null, $mode, $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);
-				foreach($data as &$row) {
+				foreach ($data as &$row) {
 					$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 				}
 			}
-			if($callback !== null) {
-				return call_user_func(function ($resultData = []) use ($data, $callback) {
-					foreach($data as $row) {
+			if ($callback !== null) {
+				return call_user_func(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;
@@ -286,20 +286,20 @@ 
 	 * @return mixed
 	 */
 	private function fetch(Closure $callback = null, $mode, $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/Internal/DDLRunnable.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,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, $response);
 		}
 		return $response;

src/Builder/Helpers/LazyRowGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -22,16 +22,16 @@
 	 * @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
-				} elseif($result !== null) {
+				} elseif ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;

src/Tools/VirtualTables.php

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@
 	 * @return Select|null
 	 */
 	public function get($tableName) {
-		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 call_user_func($table, $params);
 				}

src/Databases/MySQL.php

Spacing +32 added lines, -32 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() {
-		if($this->virtualTables === null) {
+		if ($this->virtualTables === null) {
 			$this->virtualTables = new VirtualTables();
 		}
 		return $this->virtualTables;
@@ -87,7 +87,7 @@ 
 	 * @return QueryStatement
 	 */
 	public function query($query) {
-		return $this->buildQueryStatement($query, function ($query) {
+		return $this->buildQueryStatement($query, function($query) {
 			$stmt = $this->pdo->query($query);
 			return $stmt;
 		});
@@ -99,7 +99,7 @@ 
 	 * @return QueryStatement
 	 */
 	public function prepare($query) {
-		return $this->buildQueryStatement((string) $query, function ($query) {
+		return $this->buildQueryStatement((string) $query, function($query) {
 			$stmt = $this->pdo->prepare($query);
 			return $stmt;
 		});
@@ -111,11 +111,11 @@ 
 	 * @return int
 	 */
 	public function exec($query, array $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;
@@ -135,12 +135,12 @@ 
 	 */
 	public function getTableFields($table) {
 		$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(function ($row) { return $row['Field']; }, $rows);
+		self::$tableFields[$table] = array_map(function($row) { return $row['Field']; }, $rows);
 		$stmt->closeCursor();
 		return self::$tableFields[$table];
 	}
@@ -152,12 +152,12 @@ 
 	 */
 	public function quoteExpression($expression, array $arguments = array()) {
 		$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);
@@ -175,14 +175,14 @@ 
 	 * @return string
 	 */
 	public function quote($value) {
-		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 = join(', ', array_map(function ($value) { return $this->quote($value); }, $value));
+		} elseif (is_array($value)) {
+			$result = join(', ', array_map(function($value) { return $this->quote($value); }, $value));
 		} else {
 			$result = $this->pdo->quote($value);
 		}
@@ -197,7 +197,7 @@ 
 		if (is_numeric($field) || !is_string($field)) {
 			throw new UnexpectedValueException('Field name is invalid');
 		}
-		if(strpos($field, '`') !== false) {
+		if (strpos($field, '`') !== false) {
 			return (string) $field;
 		}
 		$parts = explode('.', $field);
@@ -212,7 +212,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;
@@ -226,7 +226,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;
@@ -240,7 +240,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;
@@ -259,8 +259,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();
@@ -274,7 +274,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -283,7 +283,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -293,7 +293,7 @@ 
 	 * @return mixed
 	 */
 	public function dryRun($callback = null) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return call_user_func($callback, $this);
@@ -317,14 +317,14 @@ 
 	 */
 	public function transaction(callable $callback = null) {
 		$result = null;
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = call_user_func($callback, $this);
 				$this->transactionCommit();
 				return $result;
 			} finally {
-				if($this->pdo->inTransaction()) {
+				if ($this->pdo->inTransaction()) {
 					$this->transactionRollback();
 				}
 			}
@@ -337,7 +337,7 @@ 
 				$rollback = false;
 				return $result;
 			} finally {
-				if($rollback) {
+				if ($rollback) {
 					$this->exec("ROLLBACK TO {$uniqueId}");
 				} else {
 					$this->exec("RELEASE SAVEPOINT {$uniqueId}");
@@ -353,10 +353,10 @@ 
 	 */
 	private function transactionEnd($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");
-		} elseif($this->transactionLevel < 1) {
-			if($this->outerTransaction) {
+		} elseif ($this->transactionLevel < 1) {
+			if ($this->outerTransaction) {
 				$this->outerTransaction = false;
 			} else {
 				call_user_func($fn);
@@ -373,7 +373,7 @@ 
 	 */
 	private function buildQueryStatement($query, $fn) {
 		$stmt = call_user_func($fn, $query);
-		if(!$stmt) {
+		if (!$stmt) {
 			throw new RuntimeException("Could not execute statement:\n{$query}");
 		}
 		$stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);

src/Databases/MySQL/MySQLExceptionInterpreter.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 		/** @link http://php.net/manual/en/class.exception.php#Hcom115813 (cHao's comment) */
 		$code = is_array($errorInfo) && isset($errorInfo[1]) ? ((int) $errorInfo[1]) : ((int) $exception->getCode());
 		$message = (string) $exception->getMessage();
-		switch($code) {
+		switch ($code) {
 			case 2006: throw new DatabaseHasGoneAwayException($message, $code, $exception);
 			case 1213: throw new SqlDeadLockException($message, $code, $exception);
 			case 1205: throw new LockWaitTimeoutExceededException($message, $code, $exception);

src/Builder/QueryStatement.php

Spacing +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@ 
 	 */
 	public function setFetchMode($mode, $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);
@@ -67,7 +67,7 @@ 
 			$timer = microtime(true);
 			$response = $this->statement->execute($params);
 			$this->queryLoggers->log($this->query, microtime(true)-$timer);
-			if(!$response) {
+			if (!$response) {
 				throw new SqlException('Execution returned with "false".');
 			}
 		});
@@ -82,7 +82,7 @@ 
 	 */
 	public function fetchAll($fetchStyle = null, $fetchArgument = null, array $ctorArgs = []) {
 		return $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);

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 = function () {};
+		if ($validationResultHandler === null) {
+			$validationResultHandler = function() {};
 		}
 		$this->validator = $validator;
 		$this->validationResultHandler = $validationResultHandler;
@@ -73,10 +73,10 @@ 
 	 * @return string[]
 	 */
 	private function buildKey($keyPath) {
-		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) {
-		$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;
 		}
-		for($idx = 0; $idx < $count; $idx++) {
+		for ($idx = 0; $idx < $count; $idx++) {
 			$part = $path[$idx];
-			if(!array_key_exists($part, $array)) {
+			if (!array_key_exists($part, $array)) {
 				return $default;
 			}
 			$array = $array[$part];