rkrx / php-mysql-query-builder

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);

src/Builder/RunnableSelect.php

Doc Comments +3 added lines, -3 removed lines

@@ -243,7 +243,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return mixed
 	 * @throws RuntimeException
 	 */
@@ -277,7 +277,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return Traversable|YieldPolyfillIterator|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
@@ -297,7 +297,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param null|string $arg0
 	 * @param Closure $resultValidator
 	 * @return mixed
 	 * @throws \Exception

Spacing +26 added lines, -26 removed lines

@@ -94,7 +94,7 @@ 
 	 * @throws \Exception
 	 */
 	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' => []];
 		});
 	}
@@ -125,7 +125,7 @@ 
 	 * @throws \Exception
 	 */
 	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];
 		});
 	}
@@ -135,11 +135,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 = array();
-				foreach($rows as $row) {
+				foreach ($rows as $row) {
 					list($key) = array_values($row);
 					$result[$key] = $row;
 				}
@@ -156,11 +156,11 @@ 
 	public function fetchGroups(array $fields) {
 		$rows = $this->fetchRows();
 		$result = array();
-		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];
@@ -174,7 +174,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray() {
-		return $this->createTempStatement(function (QueryStatement $stmt) {
+		return $this->createTempStatement(function(QueryStatement $stmt) {
 			return $stmt->fetchAll(\PDO::FETCH_COLUMN);
 		});
 	}
@@ -184,9 +184,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;
@@ -227,7 +227,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;
@@ -248,20 +248,20 @@ 
 	 * @throws RuntimeException
 	 */
 	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;
@@ -281,8 +281,8 @@ 
 	 * @return Traversable|YieldPolyfillIterator|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
-		if(version_compare(PHP_VERSION, '5.5', '<')) {
-			return new YieldPolyfillIterator($callback, $this->preserveTypes, function () use ($mode, $arg0) {
+		if (version_compare(PHP_VERSION, '5.5', '<')) {
+			return new YieldPolyfillIterator($callback, $this->preserveTypes, function() use ($mode, $arg0) {
 				$statement = $this->createStatement();
 				$statement->setFetchMode($mode, $arg0);
 				return $statement;
@@ -303,20 +303,20 @@ 
 	 * @throws \Exception
 	 */
 	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/Insert.php

Spacing +15 added lines, -15 removed lines

@@ -88,7 +88,7 @@ 
 	 * @return $this
 	 */
 	public function addExpr($str, $_) {
-		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, $_) {
-		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, $_) {
-		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, $_) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
+		if ($expression instanceof OptionalExpression) {
+			if ($expression->isValid()) {
 				$this->where[] = [$expression->getExpression(), $expression->getValue()];
 			}
 		} else {