rkrx / php-mysql-query-builder

src/QueryLogger/QueryLoggers.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	 * @return $this
 	 */
 	public function log($query, $duration) {
-		foreach($this->queryLoggers as $queryLogger) {
+		foreach ($this->queryLoggers as $queryLogger) {
 			$queryLogger->log($query, $duration);
 		}
 		return $this;

src/Databases/MySQL.php

Spacing +28 added lines, -28 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param PDO $pdo
 	 */
 	public function __construct(PDO $pdo) {
-		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;
@@ -64,7 +64,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;
 		});
@@ -76,7 +76,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;
 		});
@@ -92,7 +92,7 @@ 
 			$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;
@@ -115,12 +115,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];
 	}
@@ -131,16 +131,16 @@ 
 	 * @return string
 	 */
 	public function quoteExpression($expression, array $arguments = array()) {
-		$func = function ($oldValue) use ($arguments) {
+		$func = function($oldValue) use ($arguments) {
 			static $idx = -1;
 			$idx++;
 			$index = $idx;
 
-			if(substr($oldValue[0], 0, 1) == ':') {
+			if (substr($oldValue[0], 0, 1) == ':') {
 				$index = (int) substr($oldValue[0], 1);
 			}
 
-			if(array_key_exists($index, $arguments)) {
+			if (array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = $this->quote($argument);
 			} else {
@@ -157,12 +157,12 @@ 
 	 * @return string
 	 */
 	public function quote($value) {
-		if(is_null($value)) {
+		if (is_null($value)) {
 			$result = 'NULL';
-		} 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));
 		/*} elseif(is_int(trim($value)) && strpos('123456789', substr(0, 1, trim($value))) !== null) {
 			$result = $value;*/
 		} else {
@@ -179,7 +179,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);
@@ -192,7 +192,7 @@ 
 	 */
 	public function select(array $fields = null) {
 		$select = new RunnableSelect($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$select->fields($fields);
 		}
 		return $select;
@@ -204,7 +204,7 @@ 
 	 */
 	public function insert(array $fields = null) {
 		$insert = new Builder\RunnableInsert($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$insert->addAll($fields);
 		}
 		return $insert;
@@ -216,7 +216,7 @@ 
 	 */
 	public function update(array $fields = null) {
 		$update = new Builder\RunnableUpdate($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$update->setAll($fields);
 		}
 		return $update;
@@ -233,8 +233,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();
@@ -249,7 +249,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -259,7 +259,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -272,14 +272,14 @@ 
 	 * @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;
-		for(; $tries--;) {
+		for (; $tries--;) {
 			try {
 				$this->transactionStart();
 				$result = call_user_func($callback, $this);
@@ -299,11 +299,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);
@@ -320,7 +320,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);

src/Databases/MySQL/MySQLExceptionInterpreter.php

Spacing +3 added lines, -3 removed lines

@@ -14,13 +14,13 @@
 	public function throwMoreConcreteException(PDOException $exception) {
 		$code = $exception->errorInfo[1];
 		$message = $exception->errorInfo[2];
-		if($code === 1213) {
+		if ($code === 1213) {
 			throw new SqlDeadLockException($message, $code, $exception);
 		}
-		if($code === 1205) {
+		if ($code === 1205) {
 			throw new LockWaitTimeoutExceededException($message, $code, $exception);
 		}
-		if($code === 1062) {
+		if ($code === 1062) {
 			throw new DuplicateUniqueKeyException($message, $code, $exception);
 		}
 		throw $exception;

src/Tools/AliasReplacer.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 	 * @return string
 	 */
 	public function replace($name) {
-		$fn = function ($values) {
+		$fn = function($values) {
 			$alias = $values[1];
 			$part = $values[2];
 			$string = $this->aliasRegistry->get($alias);
-			return $string . $part;
+			return $string.$part;
 		};
 		return preg_replace_callback('/^(\\w+)#(\\w+)$/', $fn, $name);
 	}

src/Tools/AliasRegistry.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 * @return string
 	 */
 	public function get($alias) {
-		if(!array_key_exists($alias, $this->aliases)) {
+		if (!array_key_exists($alias, $this->aliases)) {
 			throw new \Exception("Alias not found: {$alias}");
 		}
 		return $this->aliases[$alias];

src/Builder/Select.php

Spacing +11 added lines, -11 removed lines

@@ -37,17 +37,17 @@ 
 	 * @return $this
 	 */
 	public function field($expression, $alias = null) {
-		if(is_object($expression)) {
+		if (is_object($expression)) {
 			$expression = (string) $expression;
 			$expression = trim($expression);
 			$expression = rtrim($expression, ';');
 			$expression = trim($expression);
 			$lines = explode("\n", $expression);
-			$lines = array_map(function ($line) { return "\t\t{$line}"; }, $lines);
+			$lines = array_map(function($line) { return "\t\t{$line}"; }, $lines);
 			$expression = join("\n", $lines);
 			$expression = sprintf("(\n%s\n\t)", $expression);
 		}
-		if($alias === null) {
+		if ($alias === null) {
 			$this->fields[] = $expression;
 		} else {
 			$this->fields[$alias] = $expression;
@@ -60,7 +60,7 @@ 
 	 * @return $this
 	 */
 	public function fields(array $fields) {
-		foreach($fields as $alias => $expression) {
+		foreach ($fields as $alias => $expression) {
 			$this->field($expression, $alias);
 		}
 		return $this;
@@ -95,7 +95,7 @@ 
 	 * @return $this
 	 */
 	public function setCalcFoundRows($calcFoundRows = true) {
-		if(ini_get("mysql.trace_mode")) {
+		if (ini_get("mysql.trace_mode")) {
 			throw new \Exception('This function cant operate with mysql.trace_mode is set.');
 		}
 		$this->calcFoundRows = $calcFoundRows;
@@ -117,12 +117,12 @@ 
 	 */
 	public function __toString() {
 		$query = "SELECT";
-		if($this->calcFoundRows) {
+		if ($this->calcFoundRows) {
 			$query .= " SQL_CALC_FOUND_ROWS";
 		}
 		$query .= "\n";
 		$query = $this->buildFields($query);
-		if(count($this->getTables())) {
+		if (count($this->getTables())) {
 			$query .= "FROM\n";
 		}
 		$query = $this->buildTables($query);
@@ -144,9 +144,9 @@ 
 	 */
 	private function buildFields($query) {
 		$fields = array();
-		if(count($this->fields)) {
-			foreach($this->fields as $alias => $expression) {
-				if(is_numeric($alias)) {
+		if (count($this->fields)) {
+			foreach ($this->fields as $alias => $expression) {
+				if (is_numeric($alias)) {
 					$fields[] = "\t{$expression}";
 				} else {
 					$fields[] = "\t{$expression} AS `{$alias}`";
@@ -163,7 +163,7 @@ 
 	 * @return string
 	 */
 	private function buildForUpdate($query) {
-		if($this->forUpdate) {
+		if ($this->forUpdate) {
 			$query .= "FOR UPDATE\n";
 		}
 		return $query;

src/Builder/Insert.php

Spacing +12 added lines, -12 removed lines

@@ -117,7 +117,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;
@@ -130,7 +130,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);
 			}
@@ -174,7 +174,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;
@@ -188,7 +188,7 @@ 
 		}
 
 		$updateData = $this->buildUpdate();
-		if($updateData) {
+		if ($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
@@ -221,12 +221,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]);
 				}
 			}
@@ -242,10 +242,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);
@@ -269,7 +269,7 @@ 
 	 * @throws Exception
 	 */
 	private function clearValues(array $values) {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -278,7 +278,7 @@ 
 		$result = array();
 
 		foreach ($values as $fieldName => $fieldValue) {
-			if(in_array($fieldName, $fields)) {
+			if (in_array($fieldName, $fields)) {
 				$result[$fieldName] = $fieldValue;
 			}
 		}

src/Builder/QueryStatement.php

Spacing +8 added lines, -8 removed lines

@@ -43,10 +43,10 @@ 
 	 * @return bool
 	 */
 	public function execute(array $params = []) {
-		return $this->exceptionHandler(function () use ($params) {
+		return $this->exceptionHandler(function() use ($params) {
 			$timer = microtime(true);
 			$response = $this->statement->execute($params);
-			$this->queryLoggers->log($this->query, microtime(true) - $timer);
+			$this->queryLoggers->log($this->query, microtime(true)-$timer);
 			return $response;
 		});
 	}
@@ -56,7 +56,7 @@ 
 	 */
 	public function fetchAll() {
 		$args = func_get_args();
-		return $this->exceptionHandler(function () use ($args) {
+		return $this->exceptionHandler(function() use ($args) {
 			return call_user_func_array([$this->statement, 'fetchAll'], $args);
 		});
 	}
@@ -68,7 +68,7 @@ 
 	 * @return mixed
 	 */
 	public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0) {
-		return $this->exceptionHandler(function () use ($fetchStyle, $cursorOrientation, $cursorOffset) {
+		return $this->exceptionHandler(function() use ($fetchStyle, $cursorOrientation, $cursorOffset) {
 			return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
 		});
 	}
@@ -78,7 +78,7 @@ 
 	 * @return mixed
 	 */
 	public function fetchColumn($columnNo = 0) {
-		return $this->exceptionHandler(function () use ($columnNo) {
+		return $this->exceptionHandler(function() use ($columnNo) {
 			return $this->statement->fetchColumn($columnNo);
 		});
 	}
@@ -87,7 +87,7 @@ 
 	 * @return bool
 	 */
 	public function closeCursor() {
-		return $this->exceptionHandler(function () {
+		return $this->exceptionHandler(function() {
 			return $this->statement->closeCursor();
 		});
 	}
@@ -96,7 +96,7 @@ 
 	 * @return int
 	 */
 	public function columnCount() {
-		return $this->exceptionHandler(function () {
+		return $this->exceptionHandler(function() {
 			return $this->statement->columnCount();
 		});
 	}
@@ -106,7 +106,7 @@ 
 	 * @return array
 	 */
 	public function getColumnMeta($columnNo) {
-		return $this->exceptionHandler(function () use ($columnNo) {
+		return $this->exceptionHandler(function() use ($columnNo) {
 			return $this->statement->getColumnMeta($columnNo);
 		});
 	}

src/Builder/Statement.php

Spacing +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
 	 * @return $this
 	 */
 	public function debug($stop = true) {
-		if(php_sapi_name() == 'cli') {
+		if (php_sapi_name() == 'cli') {
 			echo "\n{$this->__toString()}\n";
 		} else {
 			echo "<pre>{$this->__toString()}</pre>";
 		}
-		if($stop) {
+		if ($stop) {
 			exit;
 		}
 		return $this;