ci-bonfire / Sprint

system/database/DB_query_builder.php

Braces +27 added lines, -49 removed lines

@@ -474,8 +474,7 @@ 
 						$this->qb_cache_exists[] = 'from';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$val = trim($val);
 
@@ -518,8 +517,7 @@ 
 			if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE))
 			{
 				$type = '';
-			}
-			else
+			} else
 			{
 				$type .= ' ';
 			}
@@ -556,12 +554,10 @@ 
 		elseif ($escape === TRUE && preg_match("/([\[\]\w\.'-]+)(\s*[^\"\[`'\w]+\s*)(.+)/i", $cond, $match))
 		{
 			$cond = ' ON '.$this->protect_identifiers($match[1]).$match[2].$this->protect_identifiers($match[3]);
-		}
-		elseif ( ! $this->_has_operator($cond))
+		} elseif ( ! $this->_has_operator($cond))
 		{
 			$cond = ' USING ('.($escape ? $this->escape_identifiers($cond) : $cond).')';
-		}
-		else
+		} else
 		{
 			$cond = ' ON '.$cond;
 		}
@@ -666,13 +662,11 @@ 
 				{
 					$k .= ' = ';
 				}
-			}
-			elseif ( ! $this->_has_operator($k))
+			} elseif ( ! $this->_has_operator($k))
 			{
 				// value appears not to have been set, assign the test to IS NULL
 				$k .= ' IS NULL';
-			}
-			elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
+			} elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
 			{
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
@@ -801,8 +795,7 @@ 
 			{
 				$where_in[] = $this->escape($value);
 			}
-		}
-		else
+		} else
 		{
 			$where_in = array_values($values);
 		}
@@ -944,16 +937,13 @@ 
 			if ($side === 'none')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}'";
-			}
-			elseif ($side === 'before')
+			} elseif ($side === 'before')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}'";
-			}
-			elseif ($side === 'after')
+			} elseif ($side === 'after')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}%'";
-			}
-			else
+			} else
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}%'";
 			}
@@ -1184,12 +1174,10 @@ 
 			$orderby = ctype_digit((string) $orderby)
 				? sprintf($this->_random_keyword[1], $orderby)
 				: $this->_random_keyword[0];
-		}
-		elseif (empty($orderby))
+		} elseif (empty($orderby))
 		{
 			return $this;
-		}
-		elseif ($direction !== '')
+		} elseif ($direction !== '')
 		{
 			$direction = in_array($direction, array('ASC', 'DESC'), TRUE) ? ' '.$direction : '';
 		}
@@ -1199,8 +1187,7 @@ 
 		if ($escape === FALSE)
 		{
 			$qb_orderby[] = array('field' => $orderby, 'direction' => $direction, 'escape' => FALSE);
-		}
-		else
+		} else
 		{
 			$qb_orderby = array();
 			foreach (explode(',', $orderby) as $field)
@@ -1646,8 +1633,7 @@ 
 		if ($table !== '')
 		{
 			$this->qb_from[0] = $table;
-		}
-		elseif ( ! isset($this->qb_from[0]))
+		} elseif ( ! isset($this->qb_from[0]))
 		{
 			return ($this->db_debug) ? $this->display_error('db_must_set_table') : FALSE;
 		}
@@ -1824,8 +1810,7 @@ 
 		if ($table !== '')
 		{
 			$this->qb_from = array($this->protect_identifiers($table, TRUE, NULL, FALSE));
-		}
-		elseif ( ! isset($this->qb_from[0]))
+		} elseif ( ! isset($this->qb_from[0]))
 		{
 			return ($this->db_debug) ? $this->display_error('db_must_set_table') : FALSE;
 		}
@@ -1995,8 +1980,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2028,8 +2012,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2102,8 +2085,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		elseif (is_array($table))
+		} elseif (is_array($table))
 		{
 			empty($where) && $reset_data = FALSE;
 
@@ -2113,8 +2095,7 @@ 
 			}
 
 			return;
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2259,16 +2240,14 @@ 
 		if ($select_override !== FALSE)
 		{
 			$sql = $select_override;
-		}
-		else
+		} else
 		{
 			$sql = ( ! $this->qb_distinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (count($this->qb_select) === 0)
 			{
 				$sql .= '*';
-			}
-			else
+			} else
 			{
 				// Cycle through the "select" portion of the query and prep each column name.
 				// The reason we protect identifiers here rather than in the select() function
@@ -2333,8 +2312,7 @@ 
 				if (is_string($this->{$qb_key}[$i]))
 				{
 					continue;
-				}
-				elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
+				} elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
 				{
 					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'];
 					continue;
@@ -2449,8 +2427,7 @@ 
 			}
 
 			return $this->qb_orderby = "\nORDER BY ".implode(', ', $this->qb_orderby);
-		}
-		elseif (is_string($this->qb_orderby))
+		} elseif (is_string($this->qb_orderby))
 		{
 			return $this->qb_orderby;
 		}
@@ -2597,15 +2574,16 @@ 
 		if (count($this->qb_cache_exists) === 0)
 		{
 			return;
-		}
-		elseif (in_array('select', $this->qb_cache_exists, TRUE))
+		} elseif (in_array('select', $this->qb_cache_exists, TRUE))
 		{
 			$qb_no_escape = $this->qb_cache_no_escape;
 		}
 
-		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
+		foreach (array_unique($this->qb_cache_exists) as $val) {
+			// select, from, etc.
 		{
 			$qb_variable	= 'qb_'.$val;
+		}
 			$qb_cache_var	= 'qb_cache_'.$val;
 			$qb_new 	= $this->$qb_cache_var;
 

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/oci8/oci8_driver.php

Braces +5 added lines, -10 removed lines

@@ -176,8 +176,7 @@ 
 		{
 			$this->dsn = $this->hostname;
 			return;
-		}
-		elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
+		} elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
 			&& (( ! empty($this->port) && ctype_digit($this->port)) OR $this->database !== ''))
 		{
 			/* If the hostname field isn't empty, doesn't contain
@@ -476,8 +475,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -500,8 +498,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -561,12 +558,10 @@ 
 		if (is_resource($this->curs_id))
 		{
 			return oci_error($this->curs_id);
-		}
-		elseif (is_resource($this->stmt_id))
+		} elseif (is_resource($this->stmt_id))
 		{
 			return oci_error($this->stmt_id);
-		}
-		elseif (is_resource($this->conn_id))
+		} elseif (is_resource($this->conn_id))
 		{
 			return oci_error($this->conn_id);
 		}

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)
 			{