rkrx / php-mysql-query-builder

src/Builder/RunnableSelect.php

Doc Comments +3 added lines, -3 removed lines

@@ -235,7 +235,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return mixed
 	 */
 	private function fetchAll(Closure $callback = null, $mode, $arg0 = null) {
@@ -268,7 +268,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param string $arg0
 	 * @return Traversable|mixed[]
 	 */
 	private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) {
@@ -281,7 +281,7 @@ 
 	/**
 	 * @param Closure $callback
 	 * @param int $mode
-	 * @param mixed $arg0
+	 * @param null|string $arg0
 	 * @param Closure $resultValidator
 	 * @return mixed
 	 */

Spacing +24 added lines, -24 removed lines

@@ -91,7 +91,7 @@ 
 	 * @return mixed[]
 	 */
 	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' => []];
 		});
 	}
@@ -120,7 +120,7 @@ 
 	 * @return object[]
 	 */
 	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];
 		});
 	}
@@ -130,11 +130,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 = [];
-				foreach($rows as $row) {
+				foreach ($rows as $row) {
 					list($key) = array_values($row);
 					$result[$key] = $row;
 				}
@@ -151,11 +151,11 @@ 
 	public function fetchGroups(array $fields) {
 		$rows = $this->fetchRows();
 		$result = [];
-		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];
@@ -169,7 +169,7 @@ 
 	 * @return string[]
 	 */
 	public function fetchArray() {
-		return $this->createTempStatement(function (QueryStatement $stmt) {
+		return $this->createTempStatement(function(QueryStatement $stmt) {
 			return $stmt->fetchAll(\PDO::FETCH_COLUMN);
 		});
 	}
@@ -179,9 +179,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;
@@ -219,7 +219,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;
@@ -239,20 +239,20 @@ 
 	 * @return mixed
 	 */
 	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;
@@ -286,20 +286,20 @@ 
 	 * @return mixed
 	 */
 	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/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 = []) {
-		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];
 	}
@@ -152,12 +152,12 @@ 
 	 */
 	public function quoteExpression($expression, array $arguments = array()) {
 		$index = -1;
-		$func = function () use ($arguments, &$index) {
+		$func = function() use ($arguments, &$index) {
 			$index++;
-			if(array_key_exists($index, $arguments)) {
+			if (array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = $this->quote($argument);
-			} elseif(count($arguments) > 0) {
+			} elseif (count($arguments) > 0) {
 				$args = $arguments;
 				$value = array_pop($args);
 				$value = $this->quote($value);
@@ -175,14 +175,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);
 		}
@@ -197,7 +197,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);
@@ -212,7 +212,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;
@@ -226,7 +226,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;
@@ -240,7 +240,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;
@@ -259,8 +259,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();
@@ -274,7 +274,7 @@ 
 	 * @return $this
 	 */
 	public function transactionCommit() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->commit();
 		});
 	}
@@ -283,7 +283,7 @@ 
 	 * @return $this
 	 */
 	public function transactionRollback() {
-		return $this->transactionEnd(function () {
+		return $this->transactionEnd(function() {
 			$this->pdo->rollBack();
 		});
 	}
@@ -293,7 +293,7 @@ 
 	 * @return mixed
 	 */
 	public function dryRun($callback = null) {
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				return call_user_func($callback, $this);
@@ -317,26 +317,26 @@ 
 	 */
 	public function transaction(callable $callback = null) {
 		$result = null;
-		if(!$this->pdo->inTransaction()) {
+		if (!$this->pdo->inTransaction()) {
 			$this->transactionStart();
 			try {
 				$result = call_user_func($callback, $this);
 				$exception = null;
 				$this->transactionCommit();
 			} finally {
-				if($this->pdo->inTransaction()) {
+				if ($this->pdo->inTransaction()) {
 					$this->transactionRollback();
 				}
 			}
 		} else {
 			$uniqueId = $this->genUniqueId();
 			$this->exec("SAVEPOINT {$uniqueId}");
-			$finally = function () use ($uniqueId) {
+			$finally = function() use ($uniqueId) {
 				$this->exec("ROLLBACK TO {$uniqueId}");
 			};
 			try {
 				$result = call_user_func($callback, $this);
-				$finally = function () use ($uniqueId) {
+				$finally = function() use ($uniqueId) {
 					$this->exec("RELEASE SAVEPOINT {$uniqueId}");
 				};
 			} finally {
@@ -353,11 +353,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);
@@ -374,7 +374,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/OrderByBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -15,8 +15,8 @@ 
 	 * @return $this
 	 */
 	public function orderBy($expression, $direction = 'asc') {
-		if($expression instanceof OrderBySpecification) {
-			foreach($expression->getFields() as $field) {
+		if ($expression instanceof OrderBySpecification) {
+			foreach ($expression->getFields() as $field) {
 				$this->addOrder($field[0], $field[1]);
 			}
 			return $this;
@@ -32,7 +32,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 ?", [$value, $idx]);
 		}
 		$this->orderBy[] = [sprintf("CASE %s\n\t\t%s\n\tEND", $this->db()->quoteField($fieldName), join("\n\t\t", $expr)), 'ASC'];
@@ -44,12 +44,12 @@ 
 	 * @return string
 	 */
 	protected function buildOrder($query) {
-		if(!count($this->orderBy)) {
+		if (!count($this->orderBy)) {
 			return $query;
 		}
 		$query .= "ORDER BY\n";
 		$arr = [];
-		foreach($this->orderBy as $order) {
+		foreach ($this->orderBy as $order) {
 			list($expression, $direction) = $order;
 			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
@@ -62,8 +62,8 @@ 
 	 */
 	private function addOrder($expression, $direction) {
 		$direction = $this->fixDirection($direction);
-		if(is_array($expression)) {
-			if(!count($expression)) {
+		if (is_array($expression)) {
+			if (!count($expression)) {
 				return;
 			}
 			$arguments = [

src/Builder/Traits/JoinBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -47,15 +47,15 @@
 	 */
 	protected function buildJoins($query) {
 		$arr = [];
-		foreach($this->joinTables as $table) {
+		foreach ($this->joinTables as $table) {
 			$join = $table['type']." JOIN\n";
-			$join .= "\t" . $this->buildTableName($table['alias'], $table['name']);
-			if($table['expression']) {
-				$join .= " ON " . $this->db()->quoteExpression($table['expression'], $table['arguments']);
+			$join .= "\t".$this->buildTableName($table['alias'], $table['name']);
+			if ($table['expression']) {
+				$join .= " ON ".$this->db()->quoteExpression($table['expression'], $table['arguments']);
 			}
 			$arr[] = $join;
 		}
-		if(count($arr)) {
+		if (count($arr)) {
 			$query .= join("\n", $arr)."\n";
 		}
 		return $query;

src/Builder/Traits/TableBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 	 * @return $this
 	 */
 	protected function addTable($alias, $table = null) {
-		if($table === null) {
+		if ($table === null) {
 			list($alias, $table) = [$table, $alias];
 		}
 		$this->tables[] = ['alias' => $alias, 'name' => $table];
@@ -26,10 +26,10 @@ 
 	 */
 	protected function buildTables($query) {
 		$arr = [];
-		foreach($this->tables as $table) {
+		foreach ($this->tables as $table) {
 			$arr[] = "\t".$this->buildTableName($table['alias'], $table['name']);
 		}
-		if(count($arr)) {
+		if (count($arr)) {
 			$query .= join(",\n", $arr)."\n";
 		}
 		return $query;

src/Builder/Traits/GroupByBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 	 * @return $this
 	 */
 	public function groupBy() {
-		foreach(func_get_args() as $expression) {
-			if(is_array($expression)) {
-				if(!count($expression)) {
+		foreach (func_get_args() as $expression) {
+			if (is_array($expression)) {
+				if (!count($expression)) {
 					continue;
 				}
 				$arguments = [
@@ -32,12 +32,12 @@ 
 	 * @return string
 	 */
 	protected function buildGroups($query) {
-		if(!count($this->groupBy)) {
+		if (!count($this->groupBy)) {
 			return $query;
 		}
 		$query .= "GROUP BY\n";
 		$arr = [];
-		foreach($this->groupBy as $expression) {
+		foreach ($this->groupBy as $expression) {
 			$arr[] = "\t{$expression}";
 		}
 		return $query.join(",\n", $arr)."\n";

src/Builder/Helpers/FieldTypeProvider.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	 */
 	public static function getFieldTypes(QueryStatement $statement) {
 		$fieldTypes = [];
-		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/Internal/DDLRunnable.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	public function run(array $params = []) {
 		$this->query->execute($params);
 		$response = $this->query->getStatement()->rowCount();
-		if($this->callbackFn !== null) {
+		if ($this->callbackFn !== null) {
 			$response = call_user_func($this->callbackFn, $response);
 		}
 		return $response;

src/Builder/Insert.php

Spacing +15 added lines, -15 removed lines

@@ -89,7 +89,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;
@@ -103,7 +103,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;
@@ -116,7 +116,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 {
@@ -133,7 +133,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;
@@ -146,7 +146,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);
 			}
@@ -190,7 +190,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;
@@ -204,7 +204,7 @@ 
 		}
 
 		$updateData = $this->buildUpdate();
-		if($updateData) {
+		if ($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
@@ -237,12 +237,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]);
 				}
 			}
@@ -259,10 +259,10 @@ 
 	 */
 	private function buildUpdate() {
 		$queryArr = [];
-		if(!empty($this->update)) {
+		if (!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = [];
-			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 @@ 
 	 * @return array
 	 */
 	private function clearValues(array $values) {
-		if(!count($values)) {
+		if (!count($values)) {
 			return [];
 		}
 
@@ -294,7 +294,7 @@ 
 		$result = [];
 
 		foreach ($values as $fieldName => $fieldValue) {
-			if(in_array($fieldName, $fields)) {
+			if (in_array($fieldName, $fields)) {
 				$result[$fieldName] = $fieldValue;
 			}
 		}