rkrx / php-mysql-query-builder

src/Builder/Traits/OrderByBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 	 * @return $this
 	 */
 	public function orderBy($expression, $direction = 'asc') {
-		if(strtolower($direction) != 'desc') {
+		if (strtolower($direction) != 'desc') {
 			$direction = 'ASC';
 		}
-		if(is_array($expression)) {
-			if(!count($expression)) {
+		if (is_array($expression)) {
+			if (!count($expression)) {
 				return $this;
 			}
 			$arguments = array(
@@ -34,7 +34,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');
@@ -46,12 +46,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));
 		}

src/Databases/MySQL/MySQLExceptionInterpreter.php

Spacing +2 added lines, -2 removed lines

@@ -16,14 +16,14 @@
 	public function throwMoreConcreteException(PDOException $exception) {
 		$code = $exception->errorInfo[1];
 		$message = (string) $exception->errorInfo[2];
-		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/Builder/RunnableSelect.php

Doc Comments +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	}
 
 	/**
-	 * @return bool
+	 * @return integer
 	 */
 	public function getFoundRows() {
 		return $this->foundRows;

Spacing +38 added lines, -38 removed lines

@@ -63,20 +63,20 @@ 
 	 * @return array[]
 	 */
 	public function fetchRows(Closure $callback = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($callback) {
 			$statement->setFetchMode(PDO::FETCH_ASSOC);
 			$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;
@@ -94,8 +94,8 @@ 
 	 * @return array[]|\Generator
 	 */
 	public function fetchRowsLazy(Closure $callback = null) {
-		if(version_compare(PHP_VERSION, '5.5', '<')) {
-			return new YieldPolyfillIterator($callback, $this->preserveTypes, function () {
+		if (version_compare(PHP_VERSION, '5.5', '<')) {
+			return new YieldPolyfillIterator($callback, $this->preserveTypes, function() {
 				$statement = $this->createStatement();
 				$statement->setFetchMode(PDO::FETCH_ASSOC);
 				return $statement;
@@ -113,19 +113,19 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchRow(Closure $callback = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($callback) {
 			$statement->setFetchMode(PDO::FETCH_ASSOC);
 			$row = $statement->fetch();
-			if(!is_array($row)) {
+			if (!is_array($row)) {
 				return [];
 			}
-			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;
 				}
 			}
@@ -140,20 +140,20 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchObjects($className, Closure $callback = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($className, $callback) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($className, $callback) {
 			$statement->setFetchMode(PDO::FETCH_CLASS, $className);
 			$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;
@@ -172,8 +172,8 @@ 
 	 * @return array[]|Generator
 	 */
 	public function fetchObjectsLazy($className, Closure $callback = null) {
-		if(version_compare(PHP_VERSION, '5.5', '<')) {
-			return new YieldPolyfillIterator($callback, $this->preserveTypes, function () use ($className) {
+		if (version_compare(PHP_VERSION, '5.5', '<')) {
+			return new YieldPolyfillIterator($callback, $this->preserveTypes, function() use ($className) {
 				$statement = $this->createStatement();
 				$statement->setFetchMode(PDO::FETCH_CLASS, $className);
 				return $statement;
@@ -192,19 +192,19 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchObject($className, Closure $callback = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($className, $callback) {
+		return $this->createTempStatement(function(QueryStatement $statement) use ($className, $callback) {
 			$statement->setFetchMode(PDO::FETCH_CLASS, $className);
 			$row = $statement->fetch();
-			if(!is_array($row)) {
+			if (!is_array($row)) {
 				return [];
 			}
-			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;
 				}
 			}
@@ -217,11 +217,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;
 				}
@@ -238,11 +238,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];
@@ -256,7 +256,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray() {
-		return $this->createTempStatement(function (QueryStatement $stmt) {
+		return $this->createTempStatement(function(QueryStatement $stmt) {
 			return $stmt->fetchAll(\PDO::FETCH_COLUMN);
 		});
 	}
@@ -266,9 +266,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;
@@ -308,7 +308,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;

src/Builder/Internal/ConditionBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
 	 * @return string
 	 */
 	public static function build(Database $db, $query, array $conditions, $token) {
-		if(!count($conditions)) {
+		if (!count($conditions)) {
 			return $query;
 		}
 		$query .= "{$token}\n";
 		$arr = [];
-		foreach($conditions as $condition) {
+		foreach ($conditions as $condition) {
 			list($expression, $arguments) = $condition;
-			if(is_array($expression)) {
-				foreach($expression as $key => $value) {
+			if (is_array($expression)) {
+				foreach ($expression as $key => $value) {
 					$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);
 				}
 			} else {

src/Databases/MySQL.php

Spacing +33 added lines, -33 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;
 		});
@@ -88,11 +88,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;
@@ -112,12 +112,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];
 	}
@@ -128,11 +128,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 {
@@ -149,14 +149,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);
 		}
@@ -171,7 +171,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);
@@ -184,7 +184,7 @@ 
 	 */
 	public function select(array $fields = null) {
 		$select = new RunnableSelect($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$select->fields($fields);
 		}
 		return $select;
@@ -196,7 +196,7 @@ 
 	 */
 	public function insert(array $fields = null) {
 		$insert = new Builder\RunnableInsert($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$insert->addAll($fields);
 		}
 		return $insert;
@@ -208,7 +208,7 @@ 
 	 */
 	public function update(array $fields = null) {
 		$update = new Builder\RunnableUpdate($this);
-		if($fields !== null) {
+		if ($fields !== null) {
 			$update->setAll($fields);
 		}
 		return $update;
@@ -225,8 +225,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();
@@ -241,7 +241,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -251,7 +251,7 @@ 
 	 * @throws \Exception
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -265,7 +265,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);
@@ -273,7 +273,7 @@ 
 				$exception = $e;
 			}
 			$this->transactionRollback();
-			if($exception !== null) {
+			if ($exception !== null) {
 				throw $exception;
 			}
 		} else {
@@ -285,7 +285,7 @@ 
 				$exception = $e;
 			}
 			$this->exec("ROLLBACK TO {$uniqueId}");
-			if($exception !== null) {
+			if ($exception !== null) {
 				throw $exception;
 			}
 		}
@@ -300,15 +300,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);
@@ -339,11 +339,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);
@@ -360,7 +360,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/Helpers/FieldTypeProvider.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	 */
 	public static function getFieldTypes(QueryStatement $statement) {
 		$fieldTypes = array();
-		for($i = 0; $column = $statement->getColumnMeta($i); $i++) {
+		for ($i = 0; $column = $statement->getColumnMeta($i); $i++) {
 			$fieldTypes[$column['name']] = self::getTypeFromNativeType($column['native_type']);
 		}
 		return $fieldTypes;

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->getData()];
 			}
 		} else {

src/Builder/Traits/WhereBuilder.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->getData()];
 			}
 		} else {

src/Builder/Expr/RequiredDBFilterMap.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 	 * @return DBExprFilter
 	 */
 	public function __invoke($expression, $keyPath, $validator = null) {
-		return new DBExprFilter($expression, $this->map, $keyPath, $validator, function ($result, array $data) {
-			if(!$result) {
+		return new DBExprFilter($expression, $this->map, $keyPath, $validator, function($result, array $data) {
+			if (!$result) {
 				throw new RequiredValueNotFoundException(sprintf("Required value %s not found", $data['key']));
 			}
 		});