rkrx / php-mysql-query-builder

src/Builder/Traits/HavingBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 	 * @return $this
 	 */
 	public function having($expression, $_ = null) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
+		if ($expression instanceof OptionalExpression) {
+			if ($expression->isValid()) {
 				$this->having[] = [$expression->getExpression(), $expression->getValue()];
 			}
 		} else {

src/Builder/Traits/WhereBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 	 * @return $this
 	 */
 	public function where($expression, $_ = null) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
+		if ($expression instanceof OptionalExpression) {
+			if ($expression->isValid()) {
 				$this->where[] = [$expression->getExpression(), $expression->getValue()];
 			}
 		} else {

src/Tools/VirtualTables.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,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/Builder/Traits/TableNameBuilder.php

Spacing +10 added lines, -10 removed lines

@@ -13,36 +13,36 @@
 	 * @return string
 	 */
 	protected function buildTableName($alias, $name) {
-		if(is_object($name) && !($name instanceof VirtualTable)) {
+		if (is_object($name) && !($name instanceof VirtualTable)) {
 			$name = (string) $name;
 			$lines = explode("\n", $name);
-			foreach($lines as &$line) {
+			foreach ($lines as &$line) {
 				$line = "\t{$line}";
 			}
 			$name = join("\n", $lines);
-			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
+			$name = '('.trim(rtrim(trim($name), ';')).')';
 		}
-		if(is_array($name)) {
+		if (is_array($name)) {
 			$parts = [];
-			foreach($name as $index => $bucket) {
-				if(ctype_digit((string) $index) && is_scalar($bucket)) {
+			foreach ($name as $index => $bucket) {
+				if (ctype_digit((string) $index) && is_scalar($bucket)) {
 					$parts[] = "SELECT {$this->db()->quote($bucket)} AS {$this->db()->quoteField('value')}";
 				} else {
 					$values = [];
-					foreach($bucket as $field => $value) {
+					foreach ($bucket as $field => $value) {
 						$values[] = sprintf('%s AS %s', $this->db()->quote($value), $this->db()->quoteField($field));
 					}
 					$parts[] = sprintf("SELECT %s", join(', ', $values));
 				}
 			}
-			$name = '(' . join("\n\tUNION\n\t", $parts) . ')';
+			$name = '('.join("\n\tUNION\n\t", $parts).')';
 		}
-		if($this->db()->getVirtualTables()->has($name)) {
+		if ($this->db()->getVirtualTables()->has($name)) {
 			$select = (string) $this->db()->getVirtualTables()->get($name);
 			$name = sprintf('(%s)', join("\n\t", explode("\n", trim($select))));
 		}
 		$name = $this->aliasReplacer()->replace($name);
-		if($alias !== null) {
+		if ($alias !== null) {
 			return sprintf("%s %s", $name, $alias);
 		}
 		return $name;

src/Databases/MySQL/MySQLExceptionInterpreter.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 		$errorInfo = $exception->errorInfo;
 		$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);
@@ -31,7 +31,7 @@ 
 			case 1452: throw new IntegrityConstraintViolationException($message, (int) $code, $exception);
 		}
 		/** @link http://php.net/manual/en/class.exception.php#Hcom115813 (cHao's comment) */
-		if(!is_string($message) || !is_int($code)) {
+		if (!is_string($message) || !is_int($code)) {
 			throw new SqlException((string) $message, (int) $code, $exception);
 		}
 		throw $exception;

src/Databases/MySQL.php

Doc Comments +1 added lines, -1 removed lines

@@ -321,7 +321,7 @@
 	}
 	
 	/**
-	 * @param int|callable $tries
+	 * @param integer $tries
 	 * @param callable|null $callback
 	 * @return mixed
 	 */

Spacing +34 added lines, -34 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 = array()) {
-		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((int) $this->transactionLevel === 0) {
-			if($this->pdo->inTransaction()) {
+		if ((int) $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();
 		});
 	}
@@ -294,7 +294,7 @@ 
 	 */
 	public function dryRun($callback = null) {
 		$result = null;
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = call_user_func($callback, $this);
@@ -329,16 +329,16 @@ 
 	 * @return mixed
 	 */
 	public function transaction($tries = 1, $callback = null) {
-		if(is_callable($tries)) {
+		if (is_callable($tries)) {
 			$callback = $tries;
 			$tries = 1;
-		} elseif(!is_callable($callback)) {
+		} elseif (!is_callable($callback)) {
 			throw new RuntimeException('$callback must be a callable');
 		}
 		$result = null;
 		$exception = null;
-		for(; $tries--;) {
-			if(!$this->pdo->inTransaction()) {
+		for (; $tries--;) {
+			if (!$this->pdo->inTransaction()) {
 				$this->transactionStart();
 				try {
 					$result = call_user_func($callback, $this);
@@ -367,7 +367,7 @@ 
 				}
 			}
 		}
-		if($exception !== null) {
+		if ($exception !== null) {
 			throw new RuntimeException($exception->getMessage(), (int) $exception->getCode(), $exception);
 		}
 		return $result;
@@ -380,11 +380,11 @@ 
 	 */
 	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");
 		}
-		if((int) $this->transactionLevel === 0) {
-			if($this->outerTransaction) {
+		if ((int) $this->transactionLevel === 0) {
+			if ($this->outerTransaction) {
 				$this->outerTransaction = false;
 			} else {
 				call_user_func($fn);
@@ -401,7 +401,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/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];