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) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
+		if ($expression instanceof OptionalExpression) {
+			if ($expression->isValid()) {
 				$this->having[] = [$expression->getExpression(), $expression->getValue()];
 			}
 		} else {

src/Builder/Traits/OrderByBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -15,8 +15,8 @@ 
 	 * @return $this
 	 */
 	public function orderBy($expression, $direction = 'asc') {
-		if($expression instanceof OrderBySpecification) {
-			foreach($expression->getFields() as $field) {
+		if ($expression instanceof OrderBySpecification) {
+			foreach ($expression->getFields() as $field) {
 				$this->addOrder($field[0], $field[1]);
 			}
 			return $this;
@@ -32,7 +32,7 @@ 
 	 */
 	public function orderByValues($fieldName, array $values) {
 		$expr = [];
-		foreach(array_values($values) as $idx => $value) {
+		foreach (array_values($values) as $idx => $value) {
 			$expr[] = $this->db()->quoteExpression("WHEN ? THEN ?", array($value, $idx));
 		}
 		$this->orderBy[] = array(sprintf("CASE %s\n\t\t%s\n\tEND", $this->db()->quoteField($fieldName), join("\n\t\t", $expr)), 'ASC');
@@ -44,12 +44,12 @@ 
 	 * @return string
 	 */
 	protected function buildOrder($query) {
-		if(!count($this->orderBy)) {
+		if (!count($this->orderBy)) {
 			return $query;
 		}
 		$query .= "ORDER BY\n";
 		$arr = array();
-		foreach($this->orderBy as $order) {
+		foreach ($this->orderBy as $order) {
 			list($expression, $direction) = $order;
 			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
@@ -62,8 +62,8 @@ 
 	 */
 	private function addOrder($expression, $direction) {
 		$direction = $this->fixDirection($direction);
-		if(is_array($expression)) {
-			if(!count($expression)) {
+		if (is_array($expression)) {
+			if (!count($expression)) {
 				return;
 			}
 			$arguments = array(

src/Builder/Traits/WhereBuilder.php

Spacing +2 added lines, -2 removed lines

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

src/Builder/Expr/DBExprOrderBySpec.php

Spacing +5 added lines, -5 removed lines

@@ -11,16 +11,16 @@
 	 */
 	public function __construct($spec, $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/Databases/MySQL/MySQLExceptionInterpreter.php

Spacing +2 added lines, -2 removed lines

@@ -16,14 +16,14 @@
 	public function throwMoreConcreteException(PDOException $exception) {
 		$code = $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);
 			case 1062: throw new DuplicateUniqueKeyException($message, $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

Spacing +33 added lines, -33 removed lines

@@ -37,7 +37,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;
@@ -73,7 +73,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;
 		});
@@ -85,7 +85,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;
 		});
@@ -97,11 +97,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;
@@ -121,12 +121,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];
 	}
@@ -137,11 +137,11 @@ 
 	 * @return string
 	 */
 	public function quoteExpression($expression, array $arguments = array()) {
-		$func = function () use ($arguments) {
+		$func = function() use ($arguments) {
 			static $idx = -1;
 			$idx++;
 			$index = $idx;
-			if(array_key_exists($index, $arguments)) {
+			if (array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = $this->quote($argument);
 			} else {
@@ -158,14 +158,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);
 		}
@@ -180,7 +180,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);
@@ -195,7 +195,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;
@@ -209,7 +209,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;
@@ -223,7 +223,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;
@@ -242,8 +242,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();
@@ -258,7 +258,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -268,7 +268,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -282,7 +282,7 @@ 
 	public function dryRun($callback = null) {
 		$result = null;
 		$exception = null;
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = call_user_func($callback, $this);
@@ -290,7 +290,7 @@ 
 				$exception = $e;
 			}
 			$this->transactionRollback();
-			if($exception !== null) {
+			if ($exception !== null) {
 				throw $exception;
 			}
 		} else {
@@ -302,7 +302,7 @@ 
 				$exception = $e;
 			}
 			$this->exec("ROLLBACK TO {$uniqueId}");
-			if($exception !== null) {
+			if ($exception !== null) {
 				throw $exception;
 			}
 		}
@@ -317,15 +317,15 @@ 
 	 * @throws null
 	 */
 	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 \Exception('$callback must be a callable');
 		}
 		$e = null;
-		if(!$this->pdo->inTransaction()) {
-			for(; $tries--;) {
+		if (!$this->pdo->inTransaction()) {
+			for (; $tries--;) {
 				try {
 					$this->transactionStart();
 					$result = call_user_func($callback, $this);
@@ -356,11 +356,11 @@ 
 	 */
 	private function transactionEnd($fn) {
 		$this->transactionLevel--;
-		if($this->transactionLevel < 0) {
+		if ($this->transactionLevel < 0) {
 			throw new \Exception("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);
@@ -377,7 +377,7 @@ 
 	 */
 	private function buildQueryStatement($query, $fn) {
 		$stmt = call_user_func($fn, $query);
-		if(!$stmt) {
+		if (!$stmt) {
 			throw new Exception("Could not execute statement:\n{$query}");
 		}
 		$stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);