rkrx / php-mysql-query-builder

src/Builder/Insert.php

Spacing +15 added lines, -15 removed lines

@@ -88,7 +88,7 @@ 
 	 * @return $this
 	 */
 	public function addExpr($str, $_ = null) {
-		if(count(func_get_args()) > 1) {
+		if (count(func_get_args()) > 1) {
 			$this->fields[] = func_get_args();
 		} else {
 			$this->fields[] = $str;
@@ -102,7 +102,7 @@ 
 	 * @return $this
 	 */
 	public function updateExpr($str, $_ = null) {
-		if(count(func_get_args()) > 1) {
+		if (count(func_get_args()) > 1) {
 			$this->update[] = func_get_args();
 		} else {
 			$this->update[] = $str;
@@ -115,7 +115,7 @@ 
 	 * @return $this
 	 */
 	public function addOrUpdateExpr($str) {
-		if(count(func_get_args()) > 1) {
+		if (count(func_get_args()) > 1) {
 			$this->fields[] = func_get_args();
 			$this->update[] = func_get_args();
 		} else {
@@ -132,7 +132,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;
@@ -145,7 +145,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);
 			}
@@ -189,7 +189,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", join(', ', array_keys($fields)));
 			$queryArr[] = $this->from;
@@ -203,7 +203,7 @@ 
 		}
 
 		$updateData = $this->buildUpdate();
-		if($updateData) {
+		if ($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
@@ -236,12 +236,12 @@ 
 	 * @return $this
 	 */
 	private function addAllTo(array $data, array $mask = null, array $excludeFields = null, $fn) {
-		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]);
 				}
 			}
@@ -258,10 +258,10 @@ 
 	 */
 	private function buildUpdate() {
 		$queryArr = array();
-		if(!empty($this->update)) {
+		if (!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = array();
-			if($this->keyField !== null) {
+			if ($this->keyField !== null) {
 				$updateArr[] = "\t`{$this->keyField}` = LAST_INSERT_ID({$this->keyField})";
 			}
 			$updateArr = $this->buildFieldList($this->update, $updateArr);
@@ -285,7 +285,7 @@ 
 	 * @throws Exception
 	 */
 	private function clearValues(array $values) {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -294,7 +294,7 @@ 
 		$result = array();
 
 		foreach ($values as $fieldName => $fieldValue) {
-			if(in_array($fieldName, $fields)) {
+			if (in_array($fieldName, $fields)) {
 				$result[$fieldName] = $fieldValue;
 			}
 		}

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/Databases/MySQL.php

Spacing +33 added lines, -33 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];
 	}
@@ -151,11 +151,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 {
@@ -172,14 +172,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);
 		}
@@ -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 (string) $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((int) $this->transactionLevel === 0) {
-			if($this->pdo->inTransaction()) {
+		if ((int) $this->transactionLevel === 0) {
+			if ($this->pdo->inTransaction()) {
 				$this->outerTransaction = true;
 			} else {
 				$this->pdo->beginTransaction();
@@ -272,7 +272,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -282,7 +282,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -295,7 +295,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);
@@ -332,16 +332,16 @@ 
 	 * @throws \Error
 	 */
 	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);
@@ -370,7 +370,7 @@ 
 				}
 			}
 		}
-		if($exception !== null) {
+		if ($exception !== null) {
 			throw $exception;
 		}
 		return $result;
@@ -383,11 +383,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);
@@ -404,7 +404,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/Traits/TableNameBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -13,32 +13,32 @@
 	 * @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 $bucket) {
+			foreach ($name as $bucket) {
 				$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/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);
 				}