chillerlan / php-database

src/Drivers/SQLite/SQLite3Driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 	 * @param string $sql    The SQL statement to prepare
 	 * @param array  $values a multidimensional array with the values, each row represents one line to insert.
 	 *
-	 * @return bool true query success, otherwise false
+	 * @return boolean|null true query success, otherwise false
 	 */
 	public function multi($sql, array $values){
 		// TODO: Implement multi() method.

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Class SQLite3Driver
- *
- * @filesource   SQLite3Driver.php
- * @created      21.02.2016
- * @package      chillerlan\Database\Drivers\SQLite
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- */
+	 * Class SQLite3Driver
+	 *
+	 * @filesource   SQLite3Driver.php
+	 * @created      21.02.2016
+	 * @package      chillerlan\Database\Drivers\SQLite
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 */
 
 namespace chillerlan\Database\Drivers\SQLite;
 

Spacing +18 added lines, -18 removed lines

@@ -21,7 +21,7 @@ 
 /**
  *
  */
-class SQLite3Driver extends DBBaseDriver implements DBDriverInterface{
+class SQLite3Driver extends DBBaseDriver implements DBDriverInterface {
 
 	/**
 	 * Holds the database resource object
@@ -36,20 +36,20 @@ 
 	 * @return \SQLite3 the database resource object
 	 * @throws \chillerlan\Database\DBException
 	 */
-	public function connect(){
+	public function connect() {
 
-		if($this->db instanceof SQLite3){
+		if ($this->db instanceof SQLite3) {
 			return $this->db;
 		}
 
-		try{
+		try {
 			$this->db = new SQLite3(
 				$this->options->database, 
 				$this->options->sqlite_flags, 
 				$this->options->sqlite_encryption_key
 			);
 		}
-		catch(Exception $Exception){
+		catch (Exception $Exception) {
 			throw new DBException($Exception->getMessage());
 		}
 
@@ -61,7 +61,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function disconnect(){
+	public function disconnect() {
 		$this->db->close();
 	}
 
@@ -70,7 +70,7 @@ 
 	 *
 	 * @return string php's database client string
 	 */
-	public function getClientInfo(){
+	public function getClientInfo() {
 		return 'SQLite '.SQLite3::version()['versionString'];
 	}
 
@@ -79,7 +79,7 @@ 
 	 *
 	 * @return string database's serverinfo string
 	 */
-	public function getServerInfo(){
+	public function getServerInfo() {
 		return 'N/A (SQLite '.SQLite3::version()['versionString'].')';
 	}
 
@@ -93,25 +93,25 @@ 
 	 *
 	 * @return array|string array or string. escaped. obviously.
 	 */
-	public function escape($data, $specialchars = false){
+	public function escape($data, $specialchars = false) {
 
-		if(is_array($data)){
+		if (is_array($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
 		}
-		else if(is_object($data)){
+		else if (is_object($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
 		}
-		else{
+		else {
 
-			if($specialchars){
+			if ($specialchars) {
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);
 			}
 
@@ -138,7 +138,7 @@ 
 	 * @return array|bool array with results, true on void query success, otherwise false.
 	 * @throws \mysqli_sql_exception
 	 */
-	public function raw($sql, $index = '', $assoc = true, $fetch_array = false){
+	public function raw($sql, $index = '', $assoc = true, $fetch_array = false) {
 		// TODO: Implement raw() method.
 	}
 
@@ -156,7 +156,7 @@ 
 	 *
 	 * @return array|bool Array with results, true on void query success, otherwise false
 	 */
-	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false){
+	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false) {
 		// TODO: Implement prepared() method.
 	}
 
@@ -170,7 +170,7 @@ 
 	 *
 	 * @return bool true query success, otherwise false
 	 */
-	public function multi($sql, array $values){
+	public function multi($sql, array $values) {
 		// TODO: Implement multi() method.
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -48,8 +48,7 @@ 
 				$this->options->sqlite_flags, 
 				$this->options->sqlite_encryption_key
 			);
-		}
-		catch(Exception $Exception){
+		} catch(Exception $Exception){
 			throw new DBException($Exception->getMessage());
 		}
 
@@ -101,15 +100,13 @@ 
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
-		}
-		else if(is_object($data)){
+		} else if(is_object($data)){
 
 			foreach($data as $key => $value){
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
-		}
-		else{
+		} else{
 
 			if($specialchars){
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);

examples/trait.php

Spacing +3 added lines, -3 removed lines

@@ -23,13 +23,13 @@ 
 /**
  * Class MyClass
  */
-class MyClass{
+class MyClass {
 	use DatabaseTrait;
 
 	protected $DBDriverInterface;
 	protected $options;
 
-	public function __construct(stdClass $class_options){
+	public function __construct(stdClass $class_options) {
 		$this->options = $class_options;
 
 		$this->DBDriverInterface = $this->dbconnect($this->options->dbdriver, $this->options->dbconfig);
@@ -42,7 +42,7 @@ 
 		var_dump($this->db);
 	}
 
-	public function __destruct(){
+	public function __destruct() {
 		$this->DBDriverInterface->disconnect();
 	}
 

src/DBException.php

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
 /**
  * Placeholder
  */
-class DBException extends Exception{
+class DBException extends Exception {
 
 }

src/DBOptions.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 /**
  *
  */
-class DBOptions{
+class DBOptions {
 
 	/**
 	 * The host
@@ -129,7 +129,7 @@ 
 	 * 
 	 * @var int
 	 */
-	public $sqlite_flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE;
+	public $sqlite_flags = SQLITE3_OPEN_READWRITE|SQLITE3_OPEN_CREATE;
 	/**
 	 * An optional encryption key used when encrypting and decrypting an SQLite database.
 	 *
@@ -144,11 +144,11 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function __construct(array $params = []){
+	public function __construct(array $params = []) {
 
-		if(is_array($params) && !empty($params)){
+		if (is_array($params) && !empty($params)) {
 
-			foreach($params as $key => $value){
+			foreach ($params as $key => $value) {
 				$this->{$key} = $value;
 			}
 

src/Drivers/DBBaseDriver.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
  *
  * @see http://blog.mclaughlinsoftware.com/2010/02/21/php-binding-a-wildcard/ LIKE %...% -> LIKE CONCAT('%',?,'%')
  */
-class DBBaseDriver{
+class DBBaseDriver {
 
 	/**
 	 * Holds the database resource object
@@ -56,7 +56,7 @@ 
 	 *
 	 * @param \chillerlan\Database\DBOptions $options
 	 */
-	public function __construct(DBOptions $options){
+	public function __construct(DBOptions $options) {
 		$this->options = $options;
 	}
 
@@ -65,7 +65,7 @@ 
 	 *
 	 * @return resource the database resource object
 	 */
-	public function getDBResource(){
+	public function getDBResource() {
 		return $this->db;
 	}
 
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return array stats
 	 */
-	public function getStats(){
+	public function getStats() {
 		return $this->stats;
 	}
 
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function enableStats(){
+	public function enableStats() {
 		$this->stats_enabled = true;
 
 		return $this;
@@ -94,7 +94,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function disableStats(){
+	public function disableStats() {
 		$this->stats_enabled = false;
 
 		return $this;
@@ -105,7 +105,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function clearStats(){
+	public function clearStats() {
 		$this->stats = [];
 
 		return $this;
@@ -116,12 +116,12 @@ 
 	 *
 	 * @param array $stats
 	 */
-	public function addStats(array $stats){
-		if($this->stats_enabled){
+	public function addStats(array $stats) {
+		if ($this->stats_enabled) {
 			$stat = new Querystats;
 
-			foreach($stat as $key => $value){
-				if(isset($stats[$key])){
+			foreach ($stat as $key => $value) {
+				if (isset($stats[$key])) {
 					$stat->{$key} = $stats[$key];
 				}
 			}

src/Drivers/DBDriverInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  *
  */
-interface DBDriverInterface{
+interface DBDriverInterface {
 
 	/**
 	 * Establishes a database connection and returns the connection object

src/Drivers/MySQLi/MySQLiDriver.php

Spacing +45 added lines, -45 removed lines

@@ -23,7 +23,7 @@ 
 /**
  *
  */
-class MySQLiDriver extends DBBaseDriver implements DBDriverInterface{
+class MySQLiDriver extends DBBaseDriver implements DBDriverInterface {
 
 	/**
 	 * Holds the database resource object
@@ -38,19 +38,19 @@ 
 	 * @return mysqli the database resource object
 	 * @throws DBException
 	 */
-	public function connect(){
+	public function connect() {
 
-		if($this->db instanceof mysqli){
+		if ($this->db instanceof mysqli) {
 			return $this->db;
 		}
 
 		$this->db = mysqli_init();
 
-		if(!$this->db->options(MYSQLI_OPT_CONNECT_TIMEOUT, $this->options->mysqli_timeout)){
+		if (!$this->db->options(MYSQLI_OPT_CONNECT_TIMEOUT, $this->options->mysqli_timeout)) {
 			throw new DBException('Could not set database timeout.');
 		}
 
-		if($this->options->use_ssl){
+		if ($this->options->use_ssl) {
 			$this->db->ssl_set(
 				$this->options->ssl_key,
 				$this->options->ssl_cert,
@@ -60,21 +60,21 @@ 
 			);
 		}
 
-		if(!$this->db->real_connect(
+		if (!$this->db->real_connect(
 			$this->options->host,
 			$this->options->username,
 			$this->options->password,
 			$this->options->database,
 			(int)$this->options->port,
 			$this->options->socket
-		)){
+		)) {
 			throw new DBException('Could not connect to the database.');
 		}
 
 		/**
 		 * @see https://mathiasbynens.be/notes/mysql-utf8mb4 How to support full Unicode in MySQL
 		 */
-		if(!$this->db->set_charset($this->options->mysql_charset)){
+		if (!$this->db->set_charset($this->options->mysql_charset)) {
 			throw new DBException('Could not set database character set.');
 		}
 
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function disconnect(){
+	public function disconnect() {
 		$this->db->close();
 	}
 
@@ -95,7 +95,7 @@ 
 	 *
 	 * @return string php's database client string
 	 */
-	public function getClientInfo(){
+	public function getClientInfo() {
 		return $this->db->client_info;
 	}
 
@@ -104,7 +104,7 @@ 
 	 *
 	 * @return string database's serverinfo string
 	 */
-	public function getServerInfo(){
+	public function getServerInfo() {
 		return $this->db->server_info;
 	}
 
@@ -118,25 +118,25 @@ 
 	 *
 	 * @return array|string array or string. escaped. obviously.
 	 */
-	public function escape($data, $specialchars = false){
+	public function escape($data, $specialchars = false) {
 
-		if(is_array($data)){
+		if (is_array($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
 		}
-		else if(is_object($data)){
+		else if (is_object($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
 		}
-		else{
+		else {
 
-			if($specialchars){
+			if ($specialchars) {
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);
 			}
 
@@ -163,9 +163,9 @@ 
 	 * @return array|bool array with results, true on void query success, otherwise false.
 	 * @throws \mysqli_sql_exception
 	 */
-	public function raw($sql, $index = '', $assoc = true, $fetch_array = false){
+	public function raw($sql, $index = '', $assoc = true, $fetch_array = false) {
 
-		try{
+		try {
 			$result = $this->db->query($sql);
 
 			$this->addStats([
@@ -178,21 +178,21 @@ 
 				'fetch_array'   => $fetch_array,
 			]);
 
-			if(!is_bool($result)){
+			if (!is_bool($result)) {
 				$out = [];
 				$method = 'fetch_'.($assoc ? ($fetch_array ? 'assoc' : 'object') : 'row');
-				$i = 0 ;
+				$i = 0;
 
 				// ok, we have a result with one or more rows, loop out the rows and output as array
-				while($row = $result->{$method}()){
+				while ($row = $result->{$method}()) {
 					$key = $i;
 
-					if($assoc && !empty($index)){
+					if ($assoc && !empty($index)) {
 
-						if($fetch_array && isset($row[$index])){
+						if ($fetch_array && isset($row[$index])) {
 							$key = $row[$index];
 						}
-						elseif(isset($row->{$index})){
+						elseif (isset($row->{$index})) {
 							$key = $row->{$index};
 						}
 
@@ -210,7 +210,7 @@ 
 			// void result
 			return $result;
 		}
-		catch(mysqli_sql_exception $mysqli_sql_exception){
+		catch (mysqli_sql_exception $mysqli_sql_exception) {
 			throw $mysqli_sql_exception;
 		}
 	}
@@ -225,10 +225,10 @@ 
 	 * @return string
 	 * @internal
 	 */
-	protected function getTypes(array &$values){
+	protected function getTypes(array &$values) {
 
-		$types = array_map(function(&$v){
-			switch(gettype($v)){
+		$types = array_map(function(&$v) {
+			switch (gettype($v)) {
 				case 'integer': return 'i';
 				case 'double':  return 'd';
 				default:        return 's';
@@ -252,18 +252,18 @@ 
 	 *
 	 * @return array|bool Array with results, true on void query success, otherwise false
 	 */
-	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false){
+	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false) {
 		$stmt = $this->db->stmt_init();
 
-		if($stmt->prepare($sql)){
+		if ($stmt->prepare($sql)) {
 			$reflectionClass = new ReflectionClass('mysqli_stmt');
 			$types = $this->getTypes($values);
 
-			if(count($values) > 0){
+			if (count($values) > 0) {
 				// copy values to reference for bind_param's sake and put the types on top of the references array
 				// see http://php.net/manual/mysqli-stmt.bind-param.php
 				$references = [];
-				foreach($values as &$field){
+				foreach ($values as &$field) {
 					$references[] = &$field;
 				}
 
@@ -289,7 +289,7 @@ 
 			$metadata = $stmt->result_metadata();
 
 			// void result
-			if(!$metadata){
+			if (!$metadata) {
 				return true;
 			}
 
@@ -297,7 +297,7 @@ 
 			// http://php.net/manual/de/mysqli-stmt.bind-result.php
 			$cols = $refs = [];
 
-			foreach($metadata->fetch_fields() as $i => &$field){
+			foreach ($metadata->fetch_fields() as $i => &$field) {
 				$refs[] = &$cols[$assoc ? $field->name : $i];
 			}
 
@@ -307,14 +307,14 @@ 
 			$output = [];
 			$count = 0;
 
-			while($stmt->fetch()){
+			while ($stmt->fetch()) {
 				$row = $fetch_array || !$assoc ? [] : new stdClass;
 
-				foreach($cols as $field => &$field){
-					if($fetch_array || !$assoc){
+				foreach ($cols as $field => &$field) {
+					if ($fetch_array || !$assoc) {
 						$row[$field] = $field;
 					}
-					else{
+					else {
 						$row->{$field} = $field;
 					}
 				}
@@ -345,19 +345,19 @@ 
 	 *
 	 * @return bool true query success, otherwise false
 	 */
-	public function multi($sql, array $values){
+	public function multi($sql, array $values) {
 
-		if(is_array($values) && count($values) > 0 && is_array($values[0]) && count($values[0]) > 0){
+		if (is_array($values) && count($values) > 0 && is_array($values[0]) && count($values[0]) > 0) {
 			$stmt = $this->db->stmt_init();
 
-			if($stmt->prepare($sql)){
+			if ($stmt->prepare($sql)) {
 				$types = $this->getTypes($values[0]);
 				$method = (new ReflectionClass('mysqli_stmt'))->getMethod('bind_param');
 
-				foreach($values as $row){
+				foreach ($values as $row) {
 
 					$references = [];
-					foreach($row as &$field){
+					foreach ($row as &$field) {
 						$references[] = &$field;
 					}
 

Braces +5 added lines, -10 removed lines

@@ -126,15 +126,13 @@ 
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
-		}
-		else if(is_object($data)){
+		} else if(is_object($data)){
 
 			foreach($data as $key => $value){
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
-		}
-		else{
+		} else{
 
 			if($specialchars){
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);
@@ -191,8 +189,7 @@ 
 
 						if($fetch_array && isset($row[$index])){
 							$key = $row[$index];
-						}
-						elseif(isset($row->{$index})){
+						} elseif(isset($row->{$index})){
 							$key = $row->{$index};
 						}
 
@@ -209,8 +206,7 @@ 
 
 			// void result
 			return $result;
-		}
-		catch(mysqli_sql_exception $mysqli_sql_exception){
+		} catch(mysqli_sql_exception $mysqli_sql_exception){
 			throw $mysqli_sql_exception;
 		}
 	}
@@ -313,8 +309,7 @@ 
 				foreach($cols as $field => &$field){
 					if($fetch_array || !$assoc){
 						$row[$field] = $field;
-					}
-					else{
+					} else{
 						$row->{$field} = $field;
 					}
 				}

src/Drivers/PDO/PDODriver.php

Spacing +43 added lines, -43 removed lines

@@ -23,7 +23,7 @@ 
  *
  * @see http://php.net/manual/pdo.constants.php
  */
-class PDODriver extends DBBaseDriver implements DBDriverInterface{
+class PDODriver extends DBBaseDriver implements DBDriverInterface {
 
 	/**
 	 * Holds the database resource object
@@ -68,13 +68,13 @@ 
 	 *
 	 * @return string DSN
 	 */
-	protected function getDSN(){
+	protected function getDSN() {
 		$dsn = $this->drivername;
 
-		if($this->options->socket){
+		if ($this->options->socket) {
 			$dsn .= ':unix_socket='.$this->options->socket;
 		}
-		else{
+		else {
 			$dsn .= ':host='.$this->options->host;
 			$dsn .= (bool)$this->options->port ? ';port='.$this->options->port : '';
 		}
@@ -90,13 +90,13 @@ 
 	 * @return \PDO the database resource object
 	 * @throws \chillerlan\Database\DBException
 	 */
-	public function connect(){
+	public function connect() {
 
-		if($this->db instanceof PDO){
+		if ($this->db instanceof PDO) {
 			return $this->db;
 		}
 
-		if($this->options->use_ssl){
+		if ($this->options->use_ssl) {
 			$this->pdo_options += [
 				PDO::MYSQL_ATTR_SSL_KEY    => $this->options->ssl_key,
 				PDO::MYSQL_ATTR_SSL_CERT   => $this->options->ssl_cert,
@@ -106,10 +106,10 @@ 
 			];
 		}
 
-		try{
+		try {
 			$this->db = new PDO($this->getDSN(), $this->options->username, $this->options->password, $this->pdo_options);
 		}
-		catch(PDOException $PDOException){
+		catch (PDOException $PDOException) {
 			throw new DBException($PDOException->getMessage());
 		}
 
@@ -121,7 +121,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function disconnect(){
+	public function disconnect() {
 		$this->db = null;
 
 		return $this;
@@ -132,7 +132,7 @@ 
 	 *
 	 * @return string php's database client string
 	 */
-	public function getClientInfo(){
+	public function getClientInfo() {
 		return $this->db->getAttribute(PDO::ATTR_CLIENT_VERSION);
 	}
 
@@ -141,7 +141,7 @@ 
 	 *
 	 * @return string database's serverinfo string
 	 */
-	public function getServerInfo(){
+	public function getServerInfo() {
 		return $this->db->getAttribute(PDO::ATTR_SERVER_INFO);
 	}
 
@@ -155,25 +155,25 @@ 
 	 *
 	 * @return array|string array or string. escaped. obviously.
 	 */
-	public function escape($data, $specialchars = false){
+	public function escape($data, $specialchars = false) {
 
-		if(is_array($data)){
+		if (is_array($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
 		}
-		else if(is_object($data)){
+		else if (is_object($data)) {
 
-			foreach($data as $key => $value){
+			foreach ($data as $key => $value) {
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
 		}
-		else{
+		else {
 
-			if($specialchars){
+			if ($specialchars) {
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);
 			}
 
@@ -192,21 +192,21 @@ 
 	 * @return array
 	 * @internal
 	 */
-	protected function getResult(PDOStatement &$stmt, $index, $assoc, $fetch_array){
+	protected function getResult(PDOStatement&$stmt, $index, $assoc, $fetch_array) {
 		$out = [];
 		$method = $assoc ? ($fetch_array ? PDO::FETCH_ASSOC : PDO::FETCH_OBJ) : PDO::FETCH_NUM;
-		$i = 0 ;
+		$i = 0;
 
 		// ok, we have a result with one or more rows, loop out the rows and output as array
-		while($row = $stmt->fetch($method)){
+		while ($row = $stmt->fetch($method)) {
 			$key = $i;
 
-			if($assoc && !empty($index)){
+			if ($assoc && !empty($index)) {
 
-				if($fetch_array && isset($row[$index])){
+				if ($fetch_array && isset($row[$index])) {
 					$key = $row[$index];
 				}
-				else if(isset($row->{$index})){
+				else if (isset($row->{$index})) {
 					$key = $row->{$index};
 				}
 
@@ -225,16 +225,16 @@ 
 	 * @param array         $values
 	 * @internal
 	 */
-	protected function bindParams(PDOStatement &$stmt, array $values){
+	protected function bindParams(PDOStatement&$stmt, array $values) {
 		$param_no = 1;
 
-		foreach($values as $v){
+		foreach ($values as $v) {
 
-			switch(gettype($v)){
+			switch (gettype($v)) {
 				case 'boolean': $type = PDO::PARAM_BOOL; break;
-				case 'integer': $type = PDO::PARAM_INT;  break;
+				case 'integer': $type = PDO::PARAM_INT; break;
 				case 'NULL':    $type = PDO::PARAM_NULL; break;
-				default:        $type = PDO::PARAM_STR;  break;
+				default:        $type = PDO::PARAM_STR; break;
 			}
 
 			$stmt->bindValue($param_no, $v, $type);
@@ -248,7 +248,7 @@ 
 	 * @link http://php.net/manual/pdo.lastinsertid.php
 	 * @return string
 	 */
-	protected function insertID(){
+	protected function insertID() {
 		return $this->db->lastInsertId();
 	}
 
@@ -269,9 +269,9 @@ 
 	 * @return array|bool array with results, true on void query success, otherwise false.
 	 * @throws \PDOException
 	 */
-	public function raw($sql, $index = '', $assoc = true, $fetch_array = false){
+	public function raw($sql, $index = '', $assoc = true, $fetch_array = false) {
 
-		try{
+		try {
 			$stmt = $this->db->query($sql);
 
 			$this->addStats([
@@ -284,14 +284,14 @@ 
 				'fetch_array'   => $fetch_array,
 			]);
 
-			if(!is_bool($stmt)){
+			if (!is_bool($stmt)) {
 				return $this->getResult($stmt, $index, $assoc, $fetch_array);
 			}
 
 			// void result
 			return $stmt;
 		}
-		catch(PDOException $PDOException){
+		catch (PDOException $PDOException) {
 			throw $PDOException;
 		}
 
@@ -312,12 +312,12 @@ 
 	 * @return array|bool Array with results, true on void query success, otherwise false
 	 * @throws \PDOException
 	 */
-	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false){
+	public function prepared($sql, array $values = [], $index = '', $assoc = true, $fetch_array = false) {
 
-		try{
+		try {
 			$stmt = $this->db->prepare($sql, $this->pdo_stmt_options);
 
-			if(!empty($values)){
+			if (!empty($values)) {
 				$this->bindParams($stmt, $values);
 			}
 
@@ -334,13 +334,13 @@ 
 				'fetch_array'   => $fetch_array,
 			]);
 
-			if(!is_bool($stmt)){
+			if (!is_bool($stmt)) {
 				return $this->getResult($stmt, $index, $assoc, $fetch_array);
 			}
 
 			return $stmt;
 		}
-		catch(PDOException $PDOException){
+		catch (PDOException $PDOException) {
 			throw $PDOException;
 		}
 	}
@@ -355,12 +355,12 @@ 
 	 *
 	 * @return bool true query success, otherwise false
 	 */
-	public function multi($sql, array $values){
+	public function multi($sql, array $values) {
 
-		if(is_array($values) && count($values) > 0 && is_array($values[0]) && count($values[0]) > 0){
+		if (is_array($values) && count($values) > 0 && is_array($values[0]) && count($values[0]) > 0) {
 			$stmt = $this->db->prepare($sql, $this->pdo_stmt_options);
 
-			foreach($values as $row){
+			foreach ($values as $row) {
 				$this->bindParams($stmt, $row);
 				$stmt->execute();
 

Braces +7 added lines, -14 removed lines

@@ -73,8 +73,7 @@ 
 
 		if($this->options->socket){
 			$dsn .= ':unix_socket='.$this->options->socket;
-		}
-		else{
+		} else{
 			$dsn .= ':host='.$this->options->host;
 			$dsn .= (bool)$this->options->port ? ';port='.$this->options->port : '';
 		}
@@ -108,8 +107,7 @@ 
 
 		try{
 			$this->db = new PDO($this->getDSN(), $this->options->username, $this->options->password, $this->pdo_options);
-		}
-		catch(PDOException $PDOException){
+		} catch(PDOException $PDOException){
 			throw new DBException($PDOException->getMessage());
 		}
 
@@ -163,15 +161,13 @@ 
 				$data[$key] = $this->escape($value, $specialchars);
 			}
 
-		}
-		else if(is_object($data)){
+		} else if(is_object($data)){
 
 			foreach($data as $key => $value){
 				$data->{$key} = $this->escape($value, $specialchars);
 			}
 
-		}
-		else{
+		} else{
 
 			if($specialchars){
 				$data = htmlspecialchars($data, ENT_HTML5, 'UTF-8', false);
@@ -205,8 +201,7 @@ 
 
 				if($fetch_array && isset($row[$index])){
 					$key = $row[$index];
-				}
-				else if(isset($row->{$index})){
+				} else if(isset($row->{$index})){
 					$key = $row->{$index};
 				}
 
@@ -290,8 +285,7 @@ 
 
 			// void result
 			return $stmt;
-		}
-		catch(PDOException $PDOException){
+		} catch(PDOException $PDOException){
 			throw $PDOException;
 		}
 
@@ -339,8 +333,7 @@ 
 			}
 
 			return $stmt;
-		}
-		catch(PDOException $PDOException){
+		} catch(PDOException $PDOException){
 			throw $PDOException;
 		}
 	}

src/Drivers/PDO/PDOFirebirdDriver.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * Class PDOFirebirdDriver
  */
-class PDOFirebirdDriver extends PDODriver implements DBDriverInterface{
+class PDOFirebirdDriver extends PDODriver implements DBDriverInterface {
 
 	/**
 	 * The PDO drivername which is being used in the DSN
@@ -30,13 +30,13 @@ 
 	 *
 	 * @return string DSN
 	 */
-	protected function getDSN(){
+	protected function getDSN() {
 		$dsn = $this->drivername.':dbname=';
 
-		if((bool)$this->options->host){
+		if ((bool)$this->options->host) {
 			$dsn .= $this->options->host;
 
-			if((bool)$this->options->port){
+			if ((bool)$this->options->port) {
 				$dsn .= '/'.$this->options->port;
 			}
 
@@ -56,7 +56,7 @@ 
 	 * @link http://php.net/manual/pdo.lastinsertid.php
 	 * @return null
 	 */
-	protected function insertID(){
+	protected function insertID() {
 		return null;
 	}