ci-bonfire / Sprint

system/database/DB_result.php

Braces +14 added lines, -17 removed lines

@@ -132,12 +132,10 @@ 
 		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);
 		}
@@ -158,12 +156,10 @@ 
 		if ($type === 'array')
 		{
 			return $this->result_array();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->result_object();
-		}
-		else
+		} else
 		{
 			return $this->custom_result_object($type);
 		}
@@ -182,8 +178,7 @@ 
 		if (isset($this->custom_result_object[$class_name]))
 		{
 			return $this->custom_result_object[$class_name];
-		}
-		elseif ( ! $this->result_id OR $this->num_rows === 0)
+		} elseif ( ! $this->result_id OR $this->num_rows === 0)
 		{
 			return array();
 		}
@@ -193,8 +188,7 @@ 
 		if (($c = count($this->result_array)) > 0)
 		{
 			$_data = 'result_array';
-		}
-		elseif (($c = count($this->result_object)) > 0)
+		} elseif (($c = count($this->result_object)) > 0)
 		{
 			$_data = 'result_object';
 		}
@@ -334,9 +328,13 @@ 
 			return $this->row_data[$n];
 		}
 
-		if ($type === 'object') return $this->row_object($n);
-		elseif ($type === 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+		if ($type === 'object') {
+			return $this->row_object($n);
+		} elseif ($type === 'array') {
+			return $this->row_array($n);
+		} else {
+			return $this->custom_row_object($n, $type);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -530,8 +528,7 @@ 
 		if ($type === 'array')
 		{
 			return $this->_fetch_assoc();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->_fetch_object();
 		}

system/database/DB_utility.php

Braces +7 added lines, -7 removed lines

@@ -103,8 +103,7 @@ 
 		if (isset($this->db->data_cache['db_names']))
 		{
 			return $this->db->data_cache['db_names'];
-		}
-		elseif ($this->_list_databases === FALSE)
+		} elseif ($this->_list_databases === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
 		}
@@ -387,8 +386,7 @@ 
 			{
 				$prefs['filename'] = (count($prefs['tables']) === 1 ? $prefs['tables'] : $this->db->database)
 							.date('Y-m-d_H-i', time()).'.sql';
-			}
-			else
+			} else
 			{
 				// If they included the .zip file extension we'll remove it
 				if (preg_match('|.+?\.zip$|', $prefs['filename']))
@@ -408,15 +406,17 @@ 
 			$CI->load->library('zip');
 			$CI->zip->add_data($prefs['filename'], $this->_backup($prefs));
 			return $CI->zip->get_zip();
-		}
-		elseif ($prefs['format'] === 'txt') // Was a text file requested?
+		} elseif ($prefs['format'] === 'txt') {
+			// Was a text file requested?
 		{
 			return $this->_backup($prefs);
 		}
-		elseif ($prefs['format'] === 'gzip') // Was a Gzip file requested?
+		} elseif ($prefs['format'] === 'gzip') {
+			// Was a Gzip file requested?
 		{
 			return gzencode($this->_backup($prefs));
 		}
+		}
 
 		return;
 	}

system/database/drivers/cubrid/cubrid_driver.php

Braces +2 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
 			{
 				$this->auto_commit = FALSE;
 			}
-		}
-		else
+		} else
 		{
 			// If no port is defined by the user, use the default value
 			empty($this->port) OR $this->port = 33000;
@@ -194,8 +193,7 @@ 
 		if (($autocommit = cubrid_get_autocommit($this->conn_id)) === NULL)
 		{
 			return FALSE;
-		}
-		elseif ($autocommit === TRUE)
+		} elseif ($autocommit === TRUE)
 		{
 			return cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_FALSE);
 		}

system/database/drivers/mysqli/mysqli_utility.php

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/odbc/odbc_result.php

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_result.php

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

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