rkrx / php-mysql-query-builder

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/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']));
 			}
 		});

src/Builder/Expr/DBExprFilter.php

Spacing +11 added lines, -11 removed lines

@@ -28,16 +28,16 @@ 
 		$this->value = $data;
 		$this->keyPath = $this->buildKey($keyPath);
 		$this->value = $this->recursiveGet($data, $this->keyPath, null);
-		if($validator === null) {
-			$validator = function ($data) {
-				if(is_array($data)) {
+		if ($validator === null) {
+			$validator = function($data) {
+				if (is_array($data)) {
 					return $this->isValidArray($data);
 				}
 				return (string) $data !== '';
 			};
 		}
-		if($validationResultHandler === null) {
-			$validationResultHandler = function () {};
+		if ($validationResultHandler === null) {
+			$validationResultHandler = function() {};
 		}
 		$this->validator = $validator;
 		$this->validationResultHandler = $validationResultHandler;
@@ -75,10 +75,10 @@ 
 	 * @throws Exception
 	 */
 	private function buildKey($keyPath) {
-		if(is_string($keyPath)) {
+		if (is_string($keyPath)) {
 			$keyPath = explode('.', $keyPath);
 		}
-		if(!is_array($keyPath)) {
+		if (!is_array($keyPath)) {
 			throw new Exception('Invalid key');
 		}
 		return $keyPath;
@@ -89,8 +89,8 @@ 
 	 * @return bool
 	 */
 	private function isValidArray(array $array) {
-		$data = array_filter($array, function ($value) {
-			if(is_array($value)) {
+		$data = array_filter($array, function($value) {
+			if (is_array($value)) {
 				return $this->isValidArray($value);
 			}
 			return (string) $value !== '';
@@ -109,9 +109,9 @@ 
 		if (!$count) {
 			return $default;
 		}
-		for($idx = 0; $idx < $count; $idx++) {
+		for ($idx = 0; $idx < $count; $idx++) {
 			$part = $path[$idx];
-			if(!array_key_exists($part, $array)) {
+			if (!array_key_exists($part, $array)) {
 				return $default;
 			}
 			$array = $array[$part];

src/Builder/Helpers/YieldPolyfillIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	}
 
 	/**
-	 * @return mixed
+	 * @return integer
 	 */
 	public function key() {
 		return $this->idx;

Spacing +8 added lines, -8 removed lines

@@ -47,16 +47,16 @@ 
 	 */
 	public function current() {
 		$row = $this->currentItem;
-		if($this->preserveTypes) {
+		if ($this->preserveTypes) {
 			$columnDefinitions = FieldTypeProvider::getFieldTypes($this->getStmt());
 			$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 		}
 		$callback = $this->callback;
-		if($callback !== null) {
+		if ($callback !== null) {
 			$result = $callback($row);
-			if($result instanceof DBIgnoreRow) {
+			if ($result instanceof DBIgnoreRow) {
 				// Do nothing in this case
-			} elseif($result !== null) {
+			} elseif ($result !== null) {
 				return $result;
 			} else {
 				return $row;
@@ -85,7 +85,7 @@ 
 	 */
 	public function valid() {
 		$result = !!$this->currentItem;
-		if(!$result) {
+		if (!$result) {
 			$this->closeCursor();
 		}
 		return $result;
@@ -94,7 +94,7 @@ 
 	/**
 	 */
 	public function rewind() {
-		if($this->stmt !== null) {
+		if ($this->stmt !== null) {
 			throw new \Exception("It's not possible to rewind this iterator");
 		}
 		$this->stmt = call_user_func($this->statementFactory);
@@ -106,7 +106,7 @@ 
 	 * @return QueryStatement
 	 */
 	private function getStmt() {
-		if($this->stmt === null) {
+		if ($this->stmt === null) {
 			$this->rewind();
 		}
 		return $this->stmt;
@@ -115,7 +115,7 @@ 
 	/**
 	 */
 	private function closeCursor() {
-		if($this->stmt instanceof QueryStatement) {
+		if ($this->stmt instanceof QueryStatement) {
 			$this->stmt->closeCursor();
 		}
 		$this->stmt = null;

src/Builder/Select.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	}
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function getFields() {
 		return $this->fields;

src/Builder/Traits/LimitBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
 	 */
 	protected function buildLimit($query, $offset = null) {
 		$limit = $this->limit;
-		if($limit === null && $offset !== null) {
+		if ($limit === null && $offset !== null) {
 			$limit = '18446744073709551615';
 		}
-		if($limit !== null) {
+		if ($limit !== null) {
 			$query .= "LIMIT\n\t{$limit}\n";
 		}
 		return $query;

src/Builder/Helpers/LazyRowGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -21,16 +21,16 @@
 	 * @return array[]|\Generator
 	 */
 	public function generate(QueryStatement $statement, Closure $callback = null) {
-		while($row = $statement->fetch()) {
-			if($this->preserveTypes) {
+		while ($row = $statement->fetch()) {
+			if ($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 			}
-			if($callback !== null) {
+			if ($callback !== null) {
 				$result = $callback($row);
-				if($result instanceof DBIgnoreRow) {
+				if ($result instanceof DBIgnoreRow) {
 					// Do nothing in this case
-				} elseif($result !== null) {
+				} elseif ($result !== null) {
 					yield $result;
 				} else {
 					yield $row;

src/Builder/QueryStatement.php

Spacing +4 added lines, -4 removed lines

@@ -46,12 +46,12 @@ 
 	 * @return $this
 	 */
 	public function setFetchMode($mode, $arg0 = null, array $arg1 = null) {
-		if($arg1 !== null) {
+		if ($arg1 !== null) {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$this->statement->setFetchMode($mode, $arg0, $arg1);
 			return $this;
 		}
-		if($arg0 !== null) {
+		if ($arg0 !== null) {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$this->statement->setFetchMode($mode, $arg0);
 			return $this;
@@ -70,7 +70,7 @@ 
 			$timer = microtime(true);
 			$response = $this->statement->execute($params);
 			$this->queryLoggers->log($this->query, microtime(true)-$timer);
-			if(!$response) {
+			if (!$response) {
 				throw new SqlException('Execution returned with "false".');
 			}
 		});
@@ -85,7 +85,7 @@ 
 	 */
 	public function fetchAll($fetchStyle = null, $fetchArgument = null, array $ctorArgs = []) {
 		return $this->exceptionHandler(function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
-			if($fetchArgument !== null) {
+			if ($fetchArgument !== null) {
 				return $this->statement->fetchAll($fetchStyle, $fetchArgument, $ctorArgs);
 			}
 			return $this->statement->fetchAll($fetchStyle);