ci-bonfire / Sprint

system/database/drivers/odbc/odbc_forge.php

Spacing +3 added lines, -3 removed lines

@@ -53,21 +53,21 @@
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= FALSE;
+	protected $_create_table_if = FALSE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= FALSE;
+	protected $_drop_table_if = FALSE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= FALSE;
+	protected $_unsigned = FALSE;
 
 	// --------------------------------------------------------------------
 

system/database/drivers/odbc/odbc_result.php

Spacing +4 added lines, -4 removed lines

@@ -130,12 +130,12 @@ 
 		$retval = array();
 		for ($i = 0, $odbc_index = 1, $c = $this->num_fields(); $i < $c; $i++, $odbc_index++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= odbc_field_name($this->result_id, $odbc_index);
 			$retval[$i]->type		= odbc_field_type($this->result_id, $odbc_index);
 			$retval[$i]->max_length		= odbc_field_len($this->result_id, $odbc_index);
 			$retval[$i]->primary_key	= 0;
-			$retval[$i]->default		= '';
+			$retval[$i]->default = '';
 		}
 
 		return $retval;
@@ -226,7 +226,7 @@ 
 		$rs_assoc = array();
 		foreach ($rs as $k => $v)
 		{
-			$field_name = odbc_field_name($result, $k+1);
+			$field_name = odbc_field_name($result, $k + 1);
 			$rs_assoc[$field_name] = $v;
 		}
 
@@ -259,7 +259,7 @@ 
 		$rs_object = new stdClass();
 		foreach ($rs as $k => $v)
 		{
-			$field_name = odbc_field_name($result, $k+1);
+			$field_name = odbc_field_name($result, $k + 1);
 			$rs_object->$field_name = $v;
 		}
 

Braces +2 added lines, -4 removed lines

@@ -60,8 +60,7 @@ 
 		if (is_int($this->num_rows))
 		{
 			return $this->num_rows;
-		}
-		elseif (($this->num_rows = odbc_num_rows($this->result_id)) !== -1)
+		} elseif (($this->num_rows = odbc_num_rows($this->result_id)) !== -1)
 		{
 			return $this->num_rows;
 		}
@@ -70,8 +69,7 @@ 
 		if (count($this->result_array) > 0)
 		{
 			return $this->num_rows = count($this->result_array);
-		}
-		elseif (count($this->result_object) > 0)
+		} elseif (count($this->result_object) > 0)
 		{
 			return $this->num_rows = count($this->result_object);
 		}

system/database/drivers/pdo/pdo_driver.php

Braces +5 added lines, -10 removed lines

@@ -94,16 +94,13 @@ 
 			$this->hostname = NULL;
 			$this->subdriver = $match[1];
 			return;
-		}
-		elseif (in_array($this->subdriver, array('mssql', 'sybase'), TRUE))
+		} elseif (in_array($this->subdriver, array('mssql', 'sybase'), TRUE))
 		{
 			$this->subdriver = 'dblib';
-		}
-		elseif ($this->subdriver === '4D')
+		} elseif ($this->subdriver === '4D')
 		{
 			$this->subdriver = '4d';
-		}
-		elseif ( ! in_array($this->subdriver, array('4d', 'cubrid', 'dblib', 'firebird', 'ibm', 'informix', 'mysql', 'oci', 'odbc', 'pgsql', 'sqlite', 'sqlsrv'), TRUE))
+		} elseif ( ! in_array($this->subdriver, array('4d', 'cubrid', 'dblib', 'firebird', 'ibm', 'informix', 'mysql', 'oci', 'odbc', 'pgsql', 'sqlite', 'sqlsrv'), TRUE))
 		{
 			log_message('error', 'PDO: Invalid or non-existent subdriver');
 
@@ -131,8 +128,7 @@ 
 		try
 		{
 			return new PDO($this->dsn, $this->username, $this->password, $this->options);
-		}
-		catch (PDOException $e)
+		} catch (PDOException $e)
 		{
 			if ($this->db_debug && empty($this->failover))
 			{
@@ -161,8 +157,7 @@ 
 		try
 		{
 			return $this->data_cache['version'] = $this->conn_id->getAttribute(PDO::ATTR_SERVER_VERSION);
-		}
-		catch (PDOException $e)
+		} catch (PDOException $e)
 		{
 			return parent::version();
 		}

system/database/drivers/pdo/pdo_forge.php

Spacing +2 added lines, -2 removed lines

@@ -53,13 +53,13 @@
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= FALSE;
+	protected $_create_table_if = FALSE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= FALSE;
+	protected $_drop_table_if = FALSE;
 
 }

system/database/drivers/pdo/pdo_result.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 			{
 				$field = $this->result_id->getColumnMeta($i);
 
-				$retval[$i]			= new stdClass();
+				$retval[$i] = new stdClass();
 				$retval[$i]->name		= $field['name'];
 				$retval[$i]->type		= $field['native_type'];
 				$retval[$i]->max_length		= ($field['len'] > 0) ? $field['len'] : NULL;

Braces +4 added lines, -8 removed lines

@@ -60,16 +60,13 @@ 
 		if (is_int($this->num_rows))
 		{
 			return $this->num_rows;
-		}
-		elseif (count($this->result_array) > 0)
+		} elseif (count($this->result_array) > 0)
 		{
 			return $this->num_rows = count($this->result_array);
-		}
-		elseif (count($this->result_object) > 0)
+		} elseif (count($this->result_object) > 0)
 		{
 			return $this->num_rows = count($this->result_object);
-		}
-		elseif (($num_rows = $this->result_id->rowCount()) > 0)
+		} elseif (($num_rows = $this->result_id->rowCount()) > 0)
 		{
 			return $this->num_rows = $num_rows;
 		}
@@ -139,8 +136,7 @@ 
 			}
 
 			return $retval;
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			if ($this->db->db_debug)
 			{

system/database/drivers/pdo/subdrivers/pdo_4d_driver.php

Braces +1 added lines, -2 removed lines

@@ -87,8 +87,7 @@
 			empty($this->port) OR $this->dsn .= ';port='.$this->port;
 			empty($this->database) OR $this->dsn .= ';dbname='.$this->database;
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
-		}
-		elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 3) === FALSE)
+		} elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 3) === FALSE)
 		{
 			$this->dsn .= ';charset='.$this->char_set;
 		}

system/database/drivers/pdo/subdrivers/pdo_4d_forge.php

Spacing +7 added lines, -7 removed lines

@@ -51,42 +51,42 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE SCHEMA %s';
+	protected $_create_database = 'CREATE SCHEMA %s';
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= 'DROP SCHEMA %s';
+	protected $_drop_database = 'DROP SCHEMA %s';
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= 'CREATE TABLE IF NOT EXISTS';
+	protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 
 	/**
 	 * RENAME TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= FALSE;
+	protected $_rename_table = FALSE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'INT16'		=> 'INT',
 		'SMALLINT'	=> 'INT',
 		'INT'		=> 'INT64',
@@ -98,7 +98,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_default		= FALSE;
+	protected $_default = FALSE;
 
 	// --------------------------------------------------------------------
 

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
 			if (stripos($field['type'], 'int') !== FALSE)
 			{
 				$field['auto_increment'] = ' AUTO_INCREMENT';
-			}
-			elseif (strcasecmp($field['type'], 'UUID') === 0)
+			} elseif (strcasecmp($field['type'], 'UUID') === 0)
 			{
 				$field['auto_increment'] = ' AUTO_GENERATE';
 			}

system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php

Spacing +4 added lines, -4 removed lines

@@ -153,16 +153,16 @@
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
-			$retval[$i]->name		= $query[$i]->Field;
+			$retval[$i] = new stdClass();
+			$retval[$i]->name = $query[$i]->Field;
 
 			sscanf($query[$i]->Type, '%[a-z](%d)',
 				$retval[$i]->type,
 				$retval[$i]->max_length
 			);
 
-			$retval[$i]->default		= $query[$i]->Default;
-			$retval[$i]->primary_key	= (int) ($query[$i]->Key === 'PRI');
+			$retval[$i]->default = $query[$i]->Default;
+			$retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
 		}
 
 		return $retval;

system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php

Spacing +5 added lines, -5 removed lines

@@ -51,14 +51,14 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= FALSE;
+	protected $_create_database = FALSE;
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= FALSE;
+	protected $_drop_database = FALSE;
 
 	/**
 	 * CREATE TABLE keys flag
@@ -68,21 +68,21 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'SHORT'		=> 'INTEGER',
 		'SMALLINT'	=> 'INTEGER',
 		'INT'		=> 'BIGINT',

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 			if ($field[$i]['_literal'] !== FALSE)
 			{
 				$sqls[] = $sql.' CHANGE '.$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				$alter_type = empty($field[$i]['new_name']) ? ' MODIFY ' : ' CHANGE ';
 				$sqls[] = $sql.$alter_type.$this->_process_column($field[$i]);
@@ -206,8 +205,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;