ci-bonfire / Sprint

system/database/drivers/mysqli/mysqli_driver.php

Spacing +10 added lines, -10 removed lines

@@ -134,9 +134,9 @@ 
 		if (is_array($this->encrypt))
 		{
 			$ssl = array();
-			empty($this->encrypt['ssl_key'])    OR $ssl['key']    = $this->encrypt['ssl_key'];
-			empty($this->encrypt['ssl_cert'])   OR $ssl['cert']   = $this->encrypt['ssl_cert'];
-			empty($this->encrypt['ssl_ca'])     OR $ssl['ca']     = $this->encrypt['ssl_ca'];
+			empty($this->encrypt['ssl_key']) OR $ssl['key']    = $this->encrypt['ssl_key'];
+			empty($this->encrypt['ssl_cert']) OR $ssl['cert']   = $this->encrypt['ssl_cert'];
+			empty($this->encrypt['ssl_ca']) OR $ssl['ca']     = $this->encrypt['ssl_ca'];
 			empty($this->encrypt['ssl_capath']) OR $ssl['capath'] = $this->encrypt['ssl_capath'];
 			empty($this->encrypt['ssl_cipher']) OR $ssl['cipher'] = $this->encrypt['ssl_cipher'];
 
@@ -149,9 +149,9 @@ 
 
 				$client_flags |= MYSQLI_CLIENT_SSL;
 				$mysqli->ssl_set(
-					isset($ssl['key'])    ? $ssl['key']    : NULL,
-					isset($ssl['cert'])   ? $ssl['cert']   : NULL,
-					isset($ssl['ca'])     ? $ssl['ca']     : NULL,
+					isset($ssl['key']) ? $ssl['key'] : NULL,
+					isset($ssl['cert']) ? $ssl['cert'] : NULL,
+					isset($ssl['ca']) ? $ssl['ca'] : NULL,
 					isset($ssl['capath']) ? $ssl['capath'] : NULL,
 					isset($ssl['cipher']) ? $ssl['cipher'] : NULL
 				);
@@ -430,16 +430,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;

Braces +2 added lines, -4 removed lines

@@ -104,8 +104,7 @@ 
 			empty($this->database) OR $this->dsn .= ';dbname='.$this->database;
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
 			empty($this->appname) OR $this->dsn .= ';appname='.$this->appname;
-		}
-		else
+		} else
 		{
 			if ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 6) === FALSE)
 			{
@@ -282,8 +281,7 @@ 
 			if (count($this->qb_select) === 0)
 			{
 				$select = '*'; // Inevitable
-			}
-			else
+			} else
 			{
 				// Use only field names and their aliases, everything else is out of our scope.
 				$select = array();

system/database/drivers/mysqli/mysqli_forge.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+	protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -63,14 +63,14 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'TINYINT',
 		'SMALLINT',
 		'MEDIUMINT',

Braces +3 added lines, -6 removed lines

@@ -162,14 +162,12 @@ 
 				$field[$i] = ($alter_type === 'ADD')
 						? "\n\tADD ".$field[$i]['_literal']
 						: "\n\tMODIFY ".$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				if ($alter_type === 'ADD')
 				{
 					$field[$i]['_literal'] = "\n\tADD ";
-				}
-				else
+				} else
 				{
 					$field[$i]['_literal'] = empty($field[$i]['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
 				}
@@ -235,8 +233,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

system/database/drivers/mysqli/mysqli_result.php

Spacing +2 added lines, -2 removed lines

@@ -110,12 +110,12 @@
 		$field_data = $this->result_id->fetch_fields();
 		for ($i = 0, $c = count($field_data); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $field_data[$i]->name;
 			$retval[$i]->type		= $field_data[$i]->type;
 			$retval[$i]->max_length		= $field_data[$i]->max_length;
 			$retval[$i]->primary_key	= (int) ($field_data[$i]->flags & 2);
-			$retval[$i]->default		= $field_data[$i]->def;
+			$retval[$i]->default = $field_data[$i]->def;
 		}
 
 		return $retval;

system/database/drivers/mysqli/mysqli_utility.php

Spacing +6 added lines, -6 removed lines

@@ -53,21 +53,21 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'SHOW DATABASES';
+	protected $_list_databases = 'SHOW DATABASES';
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= 'OPTIMIZE TABLE %s';
+	protected $_optimize_table = 'OPTIMIZE TABLE %s';
 
 	/**
 	 * REPAIR TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_repair_table	= 'REPAIR TABLE %s';
+	protected $_repair_table = 'REPAIR TABLE %s';
 
 	// --------------------------------------------------------------------
 
@@ -96,7 +96,7 @@ 
 			$output .= 'SET foreign_key_checks = 0;'.$newline;
 		}
 
-		foreach ( (array) $tables as $table)
+		foreach ((array) $tables as $table)
 		{
 			// Is the table in the "ignore" list?
 			if (in_array($table, (array) $ignore, TRUE))
@@ -165,7 +165,7 @@ 
 			}
 
 			// Trim off the end comma
-			$field_str = preg_replace('/, $/' , '', $field_str);
+			$field_str = preg_replace('/, $/', '', $field_str);
 
 			// Build the insert string
 			foreach ($query->result_array() as $row)
@@ -192,7 +192,7 @@ 
 				}
 
 				// Remove the comma at the end of the string
-				$val_str = preg_replace('/, $/' , '', $val_str);
+				$val_str = preg_replace('/, $/', '', $val_str);
 
 				// Build the INSERT string
 				$output .= 'INSERT INTO '.$this->db->protect_identifiers($table).' ('.$field_str.') VALUES ('.$val_str.');'.$newline;

Braces +1 added lines, -2 removed lines

@@ -179,8 +179,7 @@
 					if ($v === NULL)
 					{
 						$val_str .= 'NULL';
-					}
-					else
+					} else
 					{
 						// Escape the data if it's not an integer
 						$val_str .= ($is_int[$i] === FALSE) ? $this->db->escape($v) : $v;

system/database/drivers/oci8/oci8_forge.php

Spacing +4 added lines, -4 removed lines

@@ -51,28 +51,28 @@
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= FALSE;
+	protected $_create_database = FALSE;
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= FALSE;
+	protected $_drop_database = 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;
 
 	// --------------------------------------------------------------------
 

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
 		if ($alter_type === 'DROP')
 		{
 			return parent::_alter_table($alter_type, $table, $field);
-		}
-		elseif ($alter_type === 'CHANGE')
+		} elseif ($alter_type === 'CHANGE')
 		{
 			$alter_type = 'MODIFY';
 		}
@@ -102,8 +101,7 @@ 
 			if ($field[$i]['_literal'] !== FALSE)
 			{
 				$field[$i] = "\n\t".$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				$field[$i]['_literal'] = "\n\t".$this->_process_column($field[$i]);
 

system/database/drivers/oci8/oci8_result.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 		$this->stmt_id = $driver_object->stmt_id;
 		$this->curs_id = $driver_object->curs_id;
 		$this->limit_used = $driver_object->limit_used;
-		$this->commit_mode =& $driver_object->commit_mode;
+		$this->commit_mode = & $driver_object->commit_mode;
 		$driver_object->stmt_id = FALSE;
 	}
 
@@ -143,10 +143,10 @@ 
 		$retval = array();
 		for ($c = 1, $fieldCount = $this->num_fields(); $c <= $fieldCount; $c++)
 		{
-			$F		= new stdClass();
+			$F = new stdClass();
 			$F->name	= oci_field_name($this->stmt_id, $c);
 			$F->type	= oci_field_type($this->stmt_id, $c);
-			$F->max_length	= oci_field_size($this->stmt_id, $c);
+			$F->max_length = oci_field_size($this->stmt_id, $c);
 
 			$retval[] = $F;
 		}

system/database/drivers/oci8/oci8_utility.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'SELECT username FROM dba_users'; // Schemas are actual usernames
+	protected $_list_databases = 'SELECT username FROM dba_users'; // Schemas are actual usernames
 
 	/**
 	 * Export

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);
 		}