ci-bonfire / Sprint

system/core/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * @param	string	$file			Configuration file name
 	 * @param	bool	$use_sections		Whether configuration values should be loaded into their own section
 	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
-	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
+	 * @return	boolean|null	TRUE if the file was loaded correctly or FALSE on failure
 	 */
 	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $is_loaded =	array();
+	public $is_loaded = array();
 
 	/**
 	 * List of paths to search when trying to load a config file.
@@ -70,7 +70,7 @@ 
 	 * @used-by	CI_Loader
 	 * @var		array
 	 */
-	public $_config_paths =	array(APPPATH);
+	public $_config_paths = array(APPPATH);
 
 	// --------------------------------------------------------------------
 
@@ -83,7 +83,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->config =& get_config();
+		$this->config = & get_config();
 
 		// Set the base_url automatically if none was provided
 		if (empty($this->config['base_url']))

Braces +10 added lines, -20 removed lines

@@ -93,16 +93,14 @@ 
 				if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE)
 				{
 					$server_addr = '['.$_SERVER['SERVER_ADDR'].']';
-				}
-				else
+				} else
 				{
 					$server_addr = $_SERVER['SERVER_ADDR'];
 				}
 
 				$base_url = (is_https() ? 'https' : 'http').'://'.$server_addr
 					.substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
-			}
-			else
+			} else
 			{
 				$base_url = 'http://localhost/';
 			}
@@ -160,8 +158,7 @@ 
 					$this->config[$file] = isset($this->config[$file])
 						? array_merge($this->config[$file], $config)
 						: $config;
-				}
-				else
+				} else
 				{
 					$this->config = array_merge($this->config, $config);
 				}
@@ -176,8 +173,7 @@ 
 		if ($loaded === TRUE)
 		{
 			return TRUE;
-		}
-		elseif ($fail_gracefully === TRUE)
+		} elseif ($fail_gracefully === TRUE)
 		{
 			return FALSE;
 		}
@@ -217,8 +213,7 @@ 
 		if ( ! isset($this->config[$item]))
 		{
 			return NULL;
-		}
-		elseif (trim($this->config[$item]) === '')
+		} elseif (trim($this->config[$item]) === '')
 		{
 			return '';
 		}
@@ -249,8 +244,7 @@ 
 			if ($protocol === '')
 			{
 				$base_url = substr($base_url, strpos($base_url, '//'));
-			}
-			else
+			} else
 			{
 				$base_url = $protocol.substr($base_url, strpos($base_url, '://'));
 			}
@@ -272,16 +266,14 @@ 
 				if (($offset = strpos($uri, '?')) !== FALSE)
 				{
 					$uri = substr($uri, 0, $offset).$suffix.substr($uri, $offset);
-				}
-				else
+				} else
 				{
 					$uri .= $suffix;
 				}
 			}
 
 			return $base_url.$this->slash_item('index_page').$uri;
-		}
-		elseif (strpos($uri, '?') === FALSE)
+		} elseif (strpos($uri, '?') === FALSE)
 		{
 			$uri = '?'.$uri;
 		}
@@ -312,8 +304,7 @@ 
 			if ($protocol === '')
 			{
 				$base_url = substr($base_url, strpos($base_url, '//'));
-			}
-			else
+			} else
 			{
 				$base_url = $protocol.substr($base_url, strpos($base_url, '://'));
 			}
@@ -342,8 +333,7 @@ 
 				$uri = implode('/', $uri);
 			}
 			return trim($uri, '/');
-		}
-		elseif (is_array($uri))
+		} elseif (is_array($uri))
 		{
 			return http_build_query($uri);
 		}

system/core/Exceptions.php

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	 * and displays it using the specified template.
 	 *
 	 * @param	string		$heading	Page heading
-	 * @param	string|string[]	$message	Error message
+	 * @param	string	$message	Error message
 	 * @param	string		$template	Template name
 	 * @param 	int		$status_code	(default: 500)
 	 *

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 			if (FALSE !== strpos($filepath, '/'))
 			{
 				$x = explode('/', $filepath);
-				$filepath = $x[count($x)-2].'/'.end($x);
+				$filepath = $x[count($x) - 2].'/'.end($x);
 			}
 
 			$template = 'html'.DIRECTORY_SEPARATOR.'error_php';

Braces +4 added lines, -8 removed lines

@@ -122,8 +122,7 @@ 
 		{
 			$heading = 'Not Found';
 			$message = 'The controller/method pair you requested was not found.';
-		}
-		else
+		} else
 		{
 			$heading = '404 Page Not Found';
 			$message = 'The page you requested was not found.';
@@ -166,8 +165,7 @@ 
 		{
 			$message = "\t".(is_array($message) ? implode("\n\t", $message) : $message);
 			$template = 'cli'.DIRECTORY_SEPARATOR.$template;
-		}
-		else
+		} else
 		{
 			set_status_header($status_code);
 			$message = '<p>'.(is_array($message) ? implode('</p><p>', $message) : $message).'</p>';
@@ -204,8 +202,7 @@ 
 		if (is_cli())
 		{
 			$templates_path .= 'cli'.DIRECTORY_SEPARATOR;
-		}
-		else
+		} else
 		{
 			set_status_header(500);
 			$templates_path .= 'html'.DIRECTORY_SEPARATOR;
@@ -255,8 +252,7 @@ 
 			}
 
 			$template = 'html'.DIRECTORY_SEPARATOR.'error_php';
-		}
-		else
+		} else
 		{
 			$template = 'cli'.DIRECTORY_SEPARATOR.'error_php';
 		}

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/core/Hooks.php

Doc Comments +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 	 * Runs a particular hook
 	 *
 	 * @param	array	$data	Hook details
-	 * @return	bool	TRUE on success or FALSE on failure
+	 * @return	boolean|null	TRUE on success or FALSE on failure
 	 */
 	protected function _run_hook($data)
 	{

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $hooks =	array();
+	public $hooks = array();
 
 	/**
 	 * Array with class objects to use hooks methods
@@ -87,7 +87,7 @@ 
 	 */
 	public function __construct()
 	{
-		$CFG =& load_class('Config', 'core');
+		$CFG = & load_class('Config', 'core');
 		log_message('info', 'Hooks Class Initialized');
 
 		// If hooks are not enabled in the config file
@@ -114,7 +114,7 @@ 
 			return;
 		}
 
-		$this->hooks =& $hook;
+		$this->hooks = & $hook;
 		$this->enabled = TRUE;
 	}
 
@@ -206,9 +206,9 @@ 
 		}
 
 		// Determine and class and/or function names
-		$class		= empty($data['class']) ? FALSE : $data['class'];
-		$function	= empty($data['function']) ? FALSE : $data['function'];
-		$params		= isset($data['params']) ? $data['params'] : '';
+		$class = empty($data['class']) ? FALSE : $data['class'];
+		$function = empty($data['function']) ? FALSE : $data['function'];
+		$params = isset($data['params']) ? $data['params'] : '';
 
 		if (empty($function))
 		{

Braces +5 added lines, -10 removed lines

@@ -143,8 +143,7 @@ 
 			{
 				$this->_run_hook($val);
 			}
-		}
-		else
+		} else
 		{
 			$this->_run_hook($this->hooks[$which]);
 		}
@@ -172,8 +171,7 @@ 
 				: $data();
 
 			return TRUE;
-		}
-		elseif ( ! is_array($data))
+		} elseif ( ! is_array($data))
 		{
 			return FALSE;
 		}
@@ -227,13 +225,11 @@ 
 				if (method_exists($this->_objects[$class], $function))
 				{
 					$this->_objects[$class]->$function($params);
-				}
-				else
+				} else
 				{
 					return $this->_in_progress = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				class_exists($class, FALSE) OR require_once($filepath);
 
@@ -246,8 +242,7 @@ 
 				$this->_objects[$class] = new $class();
 				$this->_objects[$class]->$function($params);
 			}
-		}
-		else
+		} else
 		{
 			function_exists($function) OR require_once($filepath);
 

system/core/Input.php

Doc Comments +5 added lines, -5 removed lines

@@ -233,7 +233,7 @@ 
 	/**
 	 * Fetch an item from the GET array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_GET
+	 * @param	string	$index		Index for item to be fetched from $_GET
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 */
@@ -247,7 +247,7 @@ 
 	/**
 	 * Fetch an item from the POST array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_POST
+	 * @param	string	$index		Index for item to be fetched from $_POST
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 */
@@ -307,9 +307,9 @@ 
 	/**
 	 * Fetch an item from the SERVER array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_SERVER
+	 * @param	string	$index		Index for item to be fetched from $_SERVER
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
-	 * @return	mixed
+	 * @return	string
 	 */
 	public function server($index, $xss_clean = NULL)
 	{
@@ -877,7 +877,7 @@ 
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	public function __get($name)
 	{

Spacing +6 added lines, -6 removed lines

@@ -137,17 +137,17 @@
 	 */
 	public function __construct()
 	{
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
 
-		$this->security =& load_class('Security', 'core');
+		$this->security = & load_class('Security', 'core');
 
 		// Do we need the UTF-8 class?
 		if (UTF8_ENABLED === TRUE)
 		{
-			$this->uni =& load_class('Utf8', 'core');
+			$this->uni = & load_class('Utf8', 'core');
 		}
 
 		// Sanitize global arrays

Braces +16 added lines, -23 removed lines

@@ -196,29 +196,30 @@ 
 		if (isset($array[$index]))
 		{
 			$value = $array[$index];
-		}
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
+			// Does the index contain array notation
 		{
 			$value = $array;
+		}
 			for ($i = 0; $i < $count; $i++)
 			{
 				$key = trim($matches[0][$i], '[]');
-				if ($key === '') // Empty notation will return the value as array
+				if ($key === '') {
+					// Empty notation will return the value as array
 				{
 					break;
 				}
+				}
 
 				if (isset($value[$key]))
 				{
 					$value = $value[$key];
-				}
-				else
+				} else
 				{
 					return NULL;
 				}
 			}
-		}
-		else
+		} else
 		{
 			return NULL;
 		}
@@ -401,8 +402,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -448,8 +448,7 @@ 
 					if ( ! $this->valid_ip($spoof))
 					{
 						$spoof = NULL;
-					}
-					else
+					} else
 					{
 						break;
 					}
@@ -502,8 +501,7 @@ 
 							}
 
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
+						} else
 						{
 							$ip = explode('.', $this->ip_address);
 							$sprintf = '%08b%08b%08b%08b';
@@ -523,8 +521,7 @@ 
 						{
 							$netaddr[$i] = intval($netaddr[$i], 16);
 						}
-					}
-					else
+					} else
 					{
 						$netaddr = explode('.', $netaddr);
 					}
@@ -605,8 +602,7 @@ 
 		if ($this->_allow_get_array === FALSE)
 		{
 			$_GET = array();
-		}
-		elseif (is_array($_GET))
+		} elseif (is_array($_GET))
 		{
 			foreach ($_GET as $key => $val)
 			{
@@ -642,8 +638,7 @@ 
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
 				{
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
-				}
-				else
+				} else
 				{
 					unset($_COOKIE[$key]);
 				}
@@ -729,8 +724,7 @@ 
 			if ($fatal === TRUE)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				set_status_header(503);
 				echo 'Disallowed Key Characters.';
@@ -885,8 +879,7 @@ 
 		{
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
 			return $this->_raw_input_stream;
-		}
-		elseif ($name === 'ip_address')
+		} elseif ($name === 'ip_address')
 		{
 			return $this->ip_address;
 		}

system/core/Loader.php

Doc Comments +10 added lines, -10 removed lines

@@ -185,7 +185,7 @@ 
 	 * @param	string	$library	Library name
 	 * @param	array	$params		Optional parameters to pass to the library class constructor
 	 * @param	string	$object_name	An optional object name to assign to
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function library($library, $params = NULL, $object_name = NULL)
 	{
@@ -229,7 +229,7 @@ 
 	 * @param	string	$model		Model name
 	 * @param	string	$name		An optional object name to assign to
 	 * @param	bool	$db_conn	An optional database connection configuration to initialize
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function model($model, $name = '', $db_conn = FALSE)
 	{
@@ -329,7 +329,7 @@ 
 	/**
 	 * Database Loader
 	 *
-	 * @param	mixed	$params		Database configuration options
+	 * @param	string|boolean	$params		Database configuration options
 	 * @param	bool	$return 	Whether to return the database object
 	 * @param	bool	$query_builder	Whether to enable Query Builder
 	 *					(overrides the configuration setting)
@@ -485,7 +485,7 @@ 
 	 *					An associative array or object containing values
 	 *					to be set, or a value's name if string
 	 * @param 	string	$val	Value to set, only used if $vars is a string
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function vars($vars, $val = '')
 	{
@@ -557,7 +557,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -628,7 +628,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -644,7 +644,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function language($files, $lang = '')
 	{
@@ -731,7 +731,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function add_package_path($path, $view_cascade = TRUE)
 	{
@@ -775,7 +775,7 @@ 
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1061,7 +1061,7 @@ 
 	 * @used-by	CI_Loader::_ci_load_library()
 	 * @uses	CI_Loader::_ci_init_library()
 	 *
-	 * @param	string	$library	Library name to load
+	 * @param	string	$library_name	Library name to load
 	 * @param	string	$file_path	Path to the library filename, relative to libraries/
 	 * @param	mixed	$params		Optional parameters to pass to the class constructor
 	 * @param	string	$object_name	Optional object name to assign to

Spacing +25 added lines, -25 removed lines

@@ -63,63 +63,63 @@ 
 	 *
 	 * @var	array
 	 */
-	protected $_ci_view_paths =	array(VIEWPATH	=> TRUE);
+	protected $_ci_view_paths = array(VIEWPATH	=> TRUE);
 
 	/**
 	 * List of paths to load libraries from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_library_paths =	array(APPPATH, BASEPATH);
+	protected $_ci_library_paths = array(APPPATH, BASEPATH);
 
 	/**
 	 * List of paths to load models from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_model_paths =	array(APPPATH);
+	protected $_ci_model_paths = array(APPPATH);
 
 	/**
 	 * List of paths to load helpers from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_helper_paths =	array(APPPATH, BASEPATH);
+	protected $_ci_helper_paths = array(APPPATH, BASEPATH);
 
 	/**
 	 * List of cached variables
 	 *
 	 * @var	array
 	 */
-	protected $_ci_cached_vars =	array();
+	protected $_ci_cached_vars = array();
 
 	/**
 	 * List of loaded classes
 	 *
 	 * @var	array
 	 */
-	protected $_ci_classes =	array();
+	protected $_ci_classes = array();
 
 	/**
 	 * List of loaded models
 	 *
 	 * @var	array
 	 */
-	protected $_ci_models =	array();
+	protected $_ci_models = array();
 
 	/**
 	 * List of loaded helpers
 	 *
 	 * @var	array
 	 */
-	protected $_ci_helpers =	array();
+	protected $_ci_helpers = array();
 
 	/**
 	 * List of class name mappings
 	 *
 	 * @var	array
 	 */
-	protected $_ci_varmap =	array(
+	protected $_ci_varmap = array(
 		'unit_test' => 'unit',
 		'user_agent' => 'agent'
 	);
@@ -136,7 +136,7 @@ 
 	public function __construct()
 	{
 		$this->_ci_ob_level = ob_get_level();
-		$this->_ci_classes =& is_loaded();
+		$this->_ci_classes = & is_loaded();
 
 		log_message('info', 'Loader Class Initialized');
 	}
@@ -269,7 +269,7 @@ 
 			return $this;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$name))
 		{
 			throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -340,7 +340,7 @@ 
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
 	{
 		// Grab the super object
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Do we even need to load the database class?
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -360,7 +360,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -375,12 +375,12 @@ 
 	 */
 	public function dbutil($db = NULL, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
 		{
 			class_exists('CI_DB', FALSE) OR $this->database();
-			$db =& $CI->db;
+			$db = & $CI->db;
 		}
 
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -407,11 +407,11 @@ 
 	 */
 	public function dbforge($db = NULL, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
 		{
 			class_exists('CI_DB', FALSE) OR $this->database();
-			$db =& $CI->db;
+			$db = & $CI->db;
 		}
 
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -744,7 +744,7 @@ 
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
 
 		// Add config file path
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 		$config->_config_paths[] = $path;
 
 		return $this;
@@ -779,7 +779,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -880,12 +880,12 @@ 
 
 		// This allows anything loaded using $this->load (views, files, etc.)
 		// to become accessible from within the Controller and Model functions.
-		$_ci_CI =& get_instance();
+		$_ci_CI = & get_instance();
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
 		{
 			if ( ! isset($this->$_ci_key))
 			{
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
 			}
 		}
 
@@ -1022,7 +1022,7 @@ 
 				// return a new instance of the object
 				if ($object_name !== NULL)
 				{
-					$CI =& get_instance();
+					$CI = & get_instance();
 					if ( ! isset($CI->$object_name))
 					{
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1083,7 +1083,7 @@ 
 			// return a new instance of the object
 			if ($object_name !== NULL)
 			{
-				$CI =& get_instance();
+				$CI = & get_instance();
 				if ( ! isset($CI->$object_name))
 				{
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1226,7 +1226,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1359,7 +1359,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Braces +16 added lines, -32 removed lines

@@ -192,16 +192,14 @@ 
 		if (empty($library))
 		{
 			return $this;
-		}
-		elseif (is_array($library))
+		} elseif (is_array($library))
 		{
 			foreach ($library as $key => $value)
 			{
 				if (is_int($key))
 				{
 					$this->library($value, $params);
-				}
-				else
+				} else
 				{
 					$this->library($key, $params, $value);
 				}
@@ -236,8 +234,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -313,8 +310,7 @@ 
 			{
 				throw new RuntimeException('Unable to locate the model you have specified: '.$model);
 			}
-		}
-		elseif ( ! is_subclass_of($model, 'CI_Model'))
+		} elseif ( ! is_subclass_of($model, 'CI_Model'))
 		{
 			throw new RuntimeException("Class ".$model." already exists and doesn't extend CI_Model");
 		}
@@ -425,8 +421,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -694,8 +689,7 @@ 
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -788,8 +782,7 @@ 
 			array_shift($this->_ci_helper_paths);
 			array_shift($this->_ci_view_paths);
 			array_pop($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -851,8 +844,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -922,8 +914,7 @@ 
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -950,8 +941,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -989,8 +979,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1108,8 +1097,7 @@ 
 				if (class_exists($prefix.$library_name, FALSE))
 				{
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$prefix.$library_name);
 				}
@@ -1129,8 +1117,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1177,8 +1164,7 @@ 
 					{
 						include($path.'config/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1188,8 +1174,7 @@ 
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1380,8 +1365,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

system/core/Output.php

Doc Comments +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
 	/**
 	 * Get Header
 	 *
-	 * @param	string	$header_name
+	 * @param	string	$header
 	 * @return	string
 	 */
 	public function get_header($header)

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $mimes =	array();
+	public $mimes = array();
 
 	/**
 	 * Mime-type for the current page
@@ -111,7 +111,7 @@ 
 	 *
 	 * @var	array
 	 */
-	protected $_profiler_sections =	array();
+	protected $_profiler_sections = array();
 
 	/**
 	 * Parse markers flag
@@ -139,7 +139,7 @@ 
 		);
 
 		// Get mime types for later
-		$this->mimes =& get_mimes();
+		$this->mimes = & get_mimes();
 
 		log_message('info', 'Output Class Initialized');
 	}
@@ -237,7 +237,7 @@ 
 			// Is this extension supported?
 			if (isset($this->mimes[$extension]))
 			{
-				$mime_type =& $this->mimes[$extension];
+				$mime_type = & $this->mimes[$extension];
 
 				if (is_array($mime_type))
 				{
@@ -306,7 +306,7 @@ 
 		{
 			if (strncasecmp($header, $headers[$i], $l = strlen($header)) === 0)
 			{
-				return trim(substr($headers[$i], $l+1));
+				return trim(substr($headers[$i], $l + 1));
 			}
 		}
 
@@ -407,13 +407,13 @@ 
 		// Note:  We use load_class() because we can't use $CI =& get_instance()
 		// since this function is sometimes called by the caching mechanism,
 		// which happens before the CI super object is available.
-		$BM =& load_class('Benchmark', 'core');
-		$CFG =& load_class('Config', 'core');
+		$BM = & load_class('Benchmark', 'core');
+		$CFG = & load_class('Config', 'core');
 
 		// Grab the super object if we can.
 		if (class_exists('CI_Controller', FALSE))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 		}
 
 		// --------------------------------------------------------------------
@@ -421,7 +421,7 @@ 
 		// Set the output data
 		if ($output === '')
 		{
-			$output =& $this->final_output;
+			$output = & $this->final_output;
 		}
 
 		// --------------------------------------------------------------------
@@ -542,7 +542,7 @@ 
 	 */
 	public function _write_cache($output)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$path = $CI->config->item('cache_path');
 		$cache_path = ($path === '') ? APPPATH.'cache/' : $path;
 
@@ -726,7 +726,7 @@ 
 	 */
 	public function delete_cache($uri = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$cache_path = $CI->config->item('cache_path');
 		if ($cache_path === '')
 		{

Braces +9 added lines, -18 removed lines

@@ -481,8 +481,7 @@ 
 				{
 					header('Content-Encoding: gzip');
 					header('Content-Length: '.strlen($output));
-				}
-				else
+				} else
 				{
 					// User agent doesn't support gzip compression,
 					// so we'll have to decompress our cache
@@ -522,8 +521,7 @@ 
 		if (method_exists($CI, '_output'))
 		{
 			$CI->_output($output);
-		}
-		else
+		} else
 		{
 			echo $output; // Send it to the browser!
 		}
@@ -561,8 +559,7 @@ 
 			if (is_array($cache_query_string))
 			{
 				$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-			}
-			else
+			} else
 			{
 				$uri .= '?'.$_SERVER['QUERY_STRING'];
 			}
@@ -610,8 +607,7 @@ 
 			}
 
 			flock($fp, LOCK_UN);
-		}
-		else
+		} else
 		{
 			log_message('error', 'Unable to secure a file lock for file at: '.$cache_path);
 			return;
@@ -626,8 +622,7 @@ 
 
 			// Send HTTP cache-control headers to browser to match file cache settings.
 			$this->set_cache_header($_SERVER['REQUEST_TIME'], $expire);
-		}
-		else
+		} else
 		{
 			@unlink($cache_path);
 			log_message('error', 'Unable to write the complete cache content at: '.$cache_path);
@@ -658,8 +653,7 @@ 
 			if (is_array($cache_query_string))
 			{
 				$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-			}
-			else
+			} else
 			{
 				$uri .= '?'.$_SERVER['QUERY_STRING'];
 			}
@@ -697,8 +691,7 @@ 
 			@unlink($filepath);
 			log_message('debug', 'Cache file has expired. File deleted.');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			// Or else send the HTTP cache control headers.
 			$this->set_cache_header($last_modified, $expire);
@@ -748,8 +741,7 @@ 
 				if (is_array($cache_query_string))
 				{
 					$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-				}
-				else
+				} else
 				{
 					$uri .= '?'.$_SERVER['QUERY_STRING'];
 				}
@@ -787,8 +779,7 @@ 
 		{
 			$this->set_status_header(304);
 			exit;
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Cache-Control: max-age='.$max_age.', public');

system/database/DB_cache.php

Doc Comments +1 added lines

@@ -69,6 +69,7 @@
 	 * Constructor
 	 *
 	 * @param	object	&$db
+	 * @param CI_DB_driver $db
 	 * @return	void
 	 */
 	public function __construct(&$db)

Spacing +3 added lines, -3 removed lines

@@ -74,8 +74,8 @@ 
 	public function __construct(&$db)
 	{
 		// Assign the main CI object to $this->CI and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->db =& $db;
+		$this->CI = & get_instance();
+		$this->db = & $db;
 		$this->CI->load->helper('file');
 
 		$this->check_path();
@@ -194,7 +194,7 @@ 
 	{
 		if ($segment_one === '')
 		{
-			$segment_one  = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
+			$segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
 		}
 
 		if ($segment_two === '')

system/database/DB_driver.php

Doc Comments +8 added lines, -2 removed lines

@@ -451,7 +451,7 @@ 
 	 *
 	 * This is just a dummy method that all drivers will override.
 	 *
-	 * @return	mixed
+	 * @return	boolean
 	 */
 	public function db_connect()
 	{
@@ -463,7 +463,7 @@ 
 	/**
 	 * Persistent database connection
 	 *
-	 * @return	mixed
+	 * @return	boolean
 	 */
 	public function db_pconnect()
 	{
@@ -508,6 +508,7 @@ 
 	 * Set client character set
 	 *
 	 * @param	string
+	 * @param string $charset
 	 * @return	bool
 	 */
 	public function db_set_charset($charset)
@@ -768,6 +769,7 @@ 
 	 * not require all the features of the main query() function.
 	 *
 	 * @param	string	the sql query
+	 * @param string $sql
 	 * @return	mixed
 	 */
 	public function simple_query($sql)
@@ -968,6 +970,7 @@ 
 	 *
 	 * @param	string	the sql statement
 	 * @param	array	an array of bind data
+	 * @param string $sql
 	 * @return	string
 	 */
 	public function compile_binds($sql, $binds)
@@ -1032,6 +1035,7 @@ 
 	 * Determines if a query is a "write" type.
 	 *
 	 * @param	string	An SQL query string
+	 * @param string $sql
 	 * @return	bool
 	 */
 	public function is_write_type($sql)
@@ -1168,6 +1172,7 @@ 
 	 * Platform-dependant string escape
 	 *
 	 * @param	string
+	 * @param string $str
 	 * @return	string
 	 */
 	protected function _escape_str($str)
@@ -1461,6 +1466,7 @@ 
 	 * @param	string	the table name
 	 * @param	array	the insert keys
 	 * @param	array	the insert values
+	 * @param string $table
 	 * @return	string
 	 */
 	protected function _insert($table, $keys, $values)

Spacing +48 added lines, -48 removed lines

@@ -92,7 +92,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbdriver		= 'mysqli';
+	public $dbdriver = 'mysqli';
 
 	/**
 	 * Sub-driver
@@ -107,63 +107,63 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbprefix		= '';
+	public $dbprefix = '';
 
 	/**
 	 * Character set
 	 *
 	 * @var	string
 	 */
-	public $char_set		= 'utf8';
+	public $char_set = 'utf8';
 
 	/**
 	 * Collation
 	 *
 	 * @var	string
 	 */
-	public $dbcollat		= 'utf8_general_ci';
+	public $dbcollat = 'utf8_general_ci';
 
 	/**
 	 * Encryption flag/data
 	 *
 	 * @var	mixed
 	 */
-	public $encrypt			= FALSE;
+	public $encrypt = FALSE;
 
 	/**
 	 * Swap Prefix
 	 *
 	 * @var	string
 	 */
-	public $swap_pre		= '';
+	public $swap_pre = '';
 
 	/**
 	 * Database port
 	 *
 	 * @var	int
 	 */
-	public $port			= '';
+	public $port = '';
 
 	/**
 	 * Persistent connection flag
 	 *
 	 * @var	bool
 	 */
-	public $pconnect		= FALSE;
+	public $pconnect = FALSE;
 
 	/**
 	 * Connection ID
 	 *
 	 * @var	object|resource
 	 */
-	public $conn_id			= FALSE;
+	public $conn_id = FALSE;
 
 	/**
 	 * Result ID
 	 *
 	 * @var	object|resource
 	 */
-	public $result_id		= FALSE;
+	public $result_id = FALSE;
 
 	/**
 	 * Debug flag
@@ -172,21 +172,21 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $db_debug		= FALSE;
+	public $db_debug = FALSE;
 
 	/**
 	 * Benchmark time
 	 *
 	 * @var	int
 	 */
-	public $benchmark		= 0;
+	public $benchmark = 0;
 
 	/**
 	 * Executed queries count
 	 *
 	 * @var	int
 	 */
-	public $query_count		= 0;
+	public $query_count = 0;
 
 	/**
 	 * Bind marker
@@ -195,7 +195,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $bind_marker		= '?';
+	public $bind_marker = '?';
 
 	/**
 	 * Save queries flag
@@ -204,7 +204,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $save_queries		= TRUE;
+	public $save_queries = TRUE;
 
 	/**
 	 * Queries list
@@ -212,7 +212,7 @@ 
 	 * @see	CI_DB_driver::$save_queries
 	 * @var	string[]
 	 */
-	public $queries			= array();
+	public $queries = array();
 
 	/**
 	 * Query times
@@ -221,7 +221,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $query_times		= array();
+	public $query_times = array();
 
 	/**
 	 * Data cache
@@ -230,28 +230,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $data_cache		= array();
+	public $data_cache = array();
 
 	/**
 	 * Transaction enabled flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_enabled		= TRUE;
+	public $trans_enabled = TRUE;
 
 	/**
 	 * Strict transaction mode flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_strict		= TRUE;
+	public $trans_strict = TRUE;
 
 	/**
 	 * Transaction depth level
 	 *
 	 * @var	int
 	 */
-	protected $_trans_depth		= 0;
+	protected $_trans_depth = 0;
 
 	/**
 	 * Transaction status flag
@@ -260,7 +260,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_status	= TRUE;
+	protected $_trans_status = TRUE;
 
 	/**
 	 * Transaction failure flag
@@ -269,28 +269,28 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_failure	= FALSE;
+	protected $_trans_failure = FALSE;
 
 	/**
 	 * Cache On flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_on		= FALSE;
+	public $cache_on = FALSE;
 
 	/**
 	 * Cache directory path
 	 *
 	 * @var	bool
 	 */
-	public $cachedir		= '';
+	public $cachedir = '';
 
 	/**
 	 * Cache auto-delete flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_autodel		= FALSE;
+	public $cache_autodel = FALSE;
 
 	/**
 	 * DB Cache object
@@ -305,7 +305,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_protect_identifiers		= TRUE;
+	protected $_protect_identifiers = TRUE;
 
 	/**
 	 * List of reserved identifiers
@@ -314,7 +314,7 @@ 
 	 *
 	 * @var	string[]
 	 */
-	protected $_reserved_identifiers	= array('*');
+	protected $_reserved_identifiers = array('*');
 
 	/**
 	 * Identifier escape character
@@ -711,8 +711,8 @@ 
 		}
 
 		// Load and instantiate the result driver
-		$driver		= $this->load_rdriver();
-		$RES		= new $driver($this);
+		$driver = $this->load_rdriver();
+		$RES = new $driver($this);
 
 		// Is query caching enabled? If so, we'll serialize the
 		// result object and save it to a cache file.
@@ -725,13 +725,13 @@ 
 			// result object, so we'll have to compile the data
 			// and save it)
 			$CR = new CI_DB_result($this);
-			$CR->result_object	= $RES->result_object();
-			$CR->result_array	= $RES->result_array();
-			$CR->num_rows		= $RES->num_rows();
+			$CR->result_object = $RES->result_object();
+			$CR->result_array = $RES->result_array();
+			$CR->num_rows = $RES->num_rows();
 
 			// Reset these since cached objects can not utilize resource IDs.
-			$CR->conn_id		= NULL;
-			$CR->result_id		= NULL;
+			$CR->conn_id = NULL;
+			$CR->result_id = NULL;
 
 			$this->CACHE->write($sql, $CR);
 		}
@@ -1553,17 +1553,17 @@ 
 				? '\s+'.preg_quote(trim(sprintf($this->_like_escape_str, $this->_like_escape_chr)), '/')
 				: '';
 			$_operators = array(
-				'\s*(?:<|>|!)?=\s*',             // =, <=, >=, !=
-				'\s*<>?\s*',                     // <, <>
-				'\s*>\s*',                       // >
-				'\s+IS NULL',                    // IS NULL
-				'\s+IS NOT NULL',                // IS NOT NULL
-				'\s+EXISTS\s*\([^\)]+\)',        // EXISTS(sql)
-				'\s+NOT EXISTS\s*\([^\)]+\)',    // NOT EXISTS(sql)
-				'\s+BETWEEN\s+',                 // BETWEEN value AND value
-				'\s+IN\s*\([^\)]+\)',            // IN(list)
-				'\s+NOT IN\s*\([^\)]+\)',        // NOT IN (list)
-				'\s+LIKE\s+\S.*('.$_les.')?',    // LIKE 'expr'[ ESCAPE '%s']
+				'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
+				'\s*<>?\s*', // <, <>
+				'\s*>\s*', // >
+				'\s+IS NULL', // IS NULL
+				'\s+IS NOT NULL', // IS NOT NULL
+				'\s+EXISTS\s*\([^\)]+\)', // EXISTS(sql)
+				'\s+NOT EXISTS\s*\([^\)]+\)', // NOT EXISTS(sql)
+				'\s+BETWEEN\s+', // BETWEEN value AND value
+				'\s+IN\s*\([^\)]+\)', // IN(list)
+				'\s+NOT IN\s*\([^\)]+\)', // NOT IN (list)
+				'\s+LIKE\s+\S.*('.$_les.')?', // LIKE 'expr'[ ESCAPE '%s']
 				'\s+NOT LIKE\s+\S.*('.$_les.')?' // NOT LIKE 'expr'[ ESCAPE '%s']
 			);
 
@@ -1731,7 +1731,7 @@ 
 	 */
 	public function display_error($error = '', $swap = '', $native = FALSE)
 	{
-		$LANG =& load_class('Lang', 'core');
+		$LANG = & load_class('Lang', 'core');
 		$LANG->load('db');
 
 		$heading = $LANG->line('db_error_heading');
@@ -1769,7 +1769,7 @@ 
 			}
 		}
 
-		$error =& load_class('Exceptions', 'core');
+		$error = & load_class('Exceptions', 'core');
 		echo $error->show_error($heading, $message, 'error_db');
 		exit(8); // EXIT_DATABASE
 	}

Braces +17 added lines, -34 removed lines

@@ -599,8 +599,7 @@ 
 		{
 			log_message('error', 'Invalid query: '.$sql);
 			return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
-		}
-		elseif ( ! is_bool($return_object))
+		} elseif ( ! is_bool($return_object))
 		{
 			$return_object = ! $this->is_write_type($sql);
 		}
@@ -975,13 +974,11 @@ 
 		if (empty($binds) OR empty($this->bind_marker) OR strpos($sql, $this->bind_marker) === FALSE)
 		{
 			return $sql;
-		}
-		elseif ( ! is_array($binds))
+		} elseif ( ! is_array($binds))
 		{
 			$binds = array($binds);
 			$bind_count = 1;
-		}
-		else
+		} else
 		{
 			// Make sure we're using numeric keys
 			$binds = array_values($binds);
@@ -1005,8 +1002,7 @@ 
 			{
 				return $sql;
 			}
-		}
-		elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
+		} elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
 		{
 			return $sql;
 		}
@@ -1093,16 +1089,13 @@ 
 		{
 			$str = array_map(array(&$this, 'escape'), $str);
 			return $str;
-		}
-		elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
+		} elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
 		{
 			return "'".$this->escape_str($str)."'";
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			return ($str === FALSE) ? 0 : 1;
-		}
-		elseif ($str === NULL)
+		} elseif ($str === NULL)
 		{
 			return 'NULL';
 		}
@@ -1253,12 +1246,10 @@ 
 				if (isset($row['table_name']))
 				{
 					$key = 'table_name';
-				}
-				elseif (isset($row['TABLE_NAME']))
+				} elseif (isset($row['TABLE_NAME']))
 				{
 					$key = 'TABLE_NAME';
-				}
-				else
+				} else
 				{
 					/* We have no other choice but to just get the first element's key.
 					 * Due to array_shift() accepting its argument by reference, if
@@ -1321,12 +1312,10 @@ 
 				if (isset($row['column_name']))
 				{
 					$key = 'column_name';
-				}
-				elseif (isset($row['COLUMN_NAME']))
+				} elseif (isset($row['COLUMN_NAME']))
 				{
 					$key = 'COLUMN_NAME';
-				}
-				else
+				} else
 				{
 					// We have no other choice but to just get the first element's key.
 					$key = key($row);
@@ -1382,8 +1371,7 @@ 
 		if ($this->_escape_char === '' OR empty($item) OR in_array($item, $this->_reserved_identifiers))
 		{
 			return $item;
-		}
-		elseif (is_array($item))
+		} elseif (is_array($item))
 		{
 			foreach ($item as $key => $value)
 			{
@@ -1410,8 +1398,7 @@ 
 					$this->_escape_char[0],
 					$this->_escape_char[1]
 				);
-			}
-			else
+			} else
 			{
 				$preg_ec[0] = $preg_ec[1] = preg_quote($this->_escape_char, '/');
 				$preg_ec[2] = $preg_ec[3] = $this->_escape_char;
@@ -1679,8 +1666,7 @@ 
 		if ( ! class_exists('CI_DB_Cache', FALSE))
 		{
 			require_once(BASEPATH.'database/DB_cache.php');
-		}
-		elseif (is_object($this->CACHE))
+		} elseif (is_object($this->CACHE))
 		{
 			return TRUE;
 		}
@@ -1739,8 +1725,7 @@ 
 		if ($native === TRUE)
 		{
 			$message = (array) $error;
-		}
-		else
+		} else
 		{
 			$message = is_array($error) ? $error : array(str_replace('%s', $swap, $LANG->line($error)));
 		}
@@ -1843,15 +1828,13 @@ 
 				? substr($item, $offset, 4).$this->escape_identifiers(substr($item, $offset + 4))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		elseif ($offset = strrpos($item, ' '))
+		} elseif ($offset = strrpos($item, ' '))
 		{
 			$alias = ($protect_identifiers)
 				? ' '.$this->escape_identifiers(substr($item, $offset + 1))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		else
+		} else
 		{
 			$alias = '';
 		}

system/database/DB_forge.php

Doc Comments +1 added lines, -1 removed lines

@@ -372,7 +372,7 @@
 	 * @param	string	$table		Table name
 	 * @param	bool	$if_not_exists	Whether to add 'IF NOT EXISTS' condition
 	 * @param	array	$attributes	Associative array of table attributes
-	 * @return	mixed
+	 * @return	boolean|string
 	 */
 	protected function _create_table($table, $if_not_exists, $attributes)
 	{

Spacing +15 added lines, -15 removed lines

@@ -58,28 +58,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $fields		= array();
+	public $fields = array();
 
 	/**
 	 * Keys data
 	 *
 	 * @var	array
 	 */
-	public $keys		= array();
+	public $keys = array();
 
 	/**
 	 * Primary Keys data
 	 *
 	 * @var	array
 	 */
-	public $primary_keys	= array();
+	public $primary_keys = array();
 
 	/**
 	 * Database character set
 	 *
 	 * @var	string
 	 */
-	public $db_char_set	= '';
+	public $db_char_set = '';
 
 	// --------------------------------------------------------------------
 
@@ -88,28 +88,28 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s';
+	protected $_create_database = 'CREATE DATABASE %s';
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= 'DROP DATABASE %s';
+	protected $_drop_database = 'DROP DATABASE %s';
 
 	/**
 	 * CREATE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table	= "%s %s (%s\n)";
+	protected $_create_table = "%s %s (%s\n)";
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= 'CREATE TABLE IF NOT EXISTS';
+	protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -119,42 +119,42 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= FALSE;
+	protected $_create_table_keys = FALSE;
 
 	/**
 	 * DROP TABLE IF EXISTS statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * RENAME TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= 'ALTER TABLE %s RENAME TO %s;';
+	protected $_rename_table = 'ALTER TABLE %s RENAME TO %s;';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= TRUE;
+	protected $_unsigned = TRUE;
 
 	/**
 	 * NULL value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_null		= '';
+	protected $_null = '';
 
 	/**
 	 * DEFAULT value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_default		= ' DEFAULT ';
+	protected $_default = ' DEFAULT ';
 
 	// --------------------------------------------------------------------
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function __construct(&$db)
 	{
-		$this->db =& $db;
+		$this->db = & $db;
 		log_message('info', 'Database Forge Class Initialized');
 	}
 

Braces +14 added lines, -28 removed lines

@@ -183,8 +183,7 @@ 
 		if ($this->_create_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_create_database, $db_name, $this->db->char_set, $this->db->dbcollat)))
+		} elseif ( ! $this->db->query(sprintf($this->_create_database, $db_name, $this->db->char_set, $this->db->dbcollat)))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -210,8 +209,7 @@ 
 		if ($this->_drop_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_drop_database, $db_name)))
+		} elseif ( ! $this->db->query(sprintf($this->_drop_database, $db_name)))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -258,8 +256,7 @@ 
 		if ($primary === TRUE)
 		{
 			$this->primary_keys[] = $key;
-		}
-		else
+		} else
 		{
 			$this->keys[] = $key;
 		}
@@ -289,8 +286,7 @@ 
 					)
 				));
 				$this->add_key('id', TRUE);
-			}
-			else
+			} else
 			{
 				if (strpos($field, ' ') === FALSE)
 				{
@@ -324,8 +320,7 @@ 
 		if ($table === '')
 		{
 			show_error('A table name is required for that operation.');
-		}
-		else
+		} else
 		{
 			$table = $this->db->dbprefix.$table;
 		}
@@ -381,8 +376,7 @@ 
 			if ($this->db->table_exists($table))
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				$if_not_exists = FALSE;
 			}
@@ -502,8 +496,7 @@ 
 				{
 					return TRUE;
 				}
-			}
-			else
+			} else
 			{
 				$sql = sprintf($this->_drop_table_if, $this->db->escape_identifiers($table));
 			}
@@ -527,8 +520,7 @@ 
 		{
 			show_error('A table name is required for that operation.');
 			return FALSE;
-		}
-		elseif ($this->_rename_table === FALSE)
+		} elseif ($this->_rename_table === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
 		}
@@ -740,8 +732,7 @@ 
 				if (isset($attributes['AFTER']))
 				{
 					$field['after'] = $attributes['AFTER'];
-				}
-				elseif (isset($attributes['FIRST']))
+				} elseif (isset($attributes['FIRST']))
 				{
 					$field['first'] = (bool) $attributes['FIRST'];
 				}
@@ -754,13 +745,11 @@ 
 				if ($attributes['NULL'] === TRUE)
 				{
 					$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-				}
-				else
+				} else
 				{
 					$field['null'] = ' NOT NULL';
 				}
-			}
-			elseif ($create_table === TRUE)
+			} elseif ($create_table === TRUE)
 			{
 				$field['null'] = ' NOT NULL';
 			}
@@ -864,8 +853,7 @@ 
 				{
 					$field['unsigned'] = ' UNSIGNED';
 					return;
-				}
-				elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
+				} elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
 				{
 					$field['type'] = $key;
 					return;
@@ -903,8 +891,7 @@ 
 				// Override the NULL attribute if that's our default
 				$attributes['NULL'] = TRUE;
 				$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-			}
-			else
+			} else
 			{
 				$field['default'] = $this->_default.$this->db->escape($attributes['DEFAULT']);
 			}
@@ -998,8 +985,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**