Inspection of "Rename filenames to prevent GitHub incorrect langu..." - kenjis/ci-phpunit-test - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 96358b...5204ad )

by Kenji

created 2017-02-10 02:22 UTC

Status

Doc Comments +8 added lines patch added patch discarded remove patch

@@ -136,6 +136,11 @@  discard block
 block discarded – undo
 	return $_is_loaded;
 }
 
+/**
+ * @param boolean $return
+ *
+ * @return boolean
+ */
 function is_cli($return = null)
 {
 	static $_return = TRUE;
@@ -148,6 +153,9 @@  discard block
 block discarded – undo
 	return $_return;
 }
 
+/**
+ * @param string $message
+ */
 function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 {
 	$status_code = abs($status_code);

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -263,7 +263,7 @@  discard block
 block discarded – undo
 
 	// Save status code in Output object
 	// added by ci-phpunit-test
-	$CI =& get_instance();
+	$CI = & get_instance();
 	$output = $CI->output;
 	$output->_status = [
 		'code'     => $code,
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
 	if (empty($_config))
 	{
 		// references cannot be directly assigned to static variables, so we use an array
-		$_config[0] =& get_config();
+		$_config[0] = & get_config();
 	}
 
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.0-Loader.php 2 patches

Doc Comments +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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|null
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
 	 *					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 = '')
 	{
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
 	 *
 	 * Clears the cached variables.
 	 *
-	 * @return  object
+	 * @return  CI_Loader
 	 */
 	public function clear_vars()
 	{
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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 = '')
 	{
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)
 	{
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1051,7 +1051,7 @@  discard block
 block discarded – undo
 	 * @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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -63,63 +63,63 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	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');
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			return $this;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$name))
 		{
 			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
 	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))
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -363,12 +363,12 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -395,11 +395,11 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
 		$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;
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -868,12 +868,12 @@  discard block
 block discarded – undo
 
 		// 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;
 			}
 		}
 
@@ -1012,7 +1012,7 @@  discard block
 block discarded – undo
 				// 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);
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
 			// 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);
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1354,7 +1354,7 @@  discard block
 block discarded – undo
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.1-Loader.php 2 patches

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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|null
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
 	 *					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 = '')
 	{
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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 = '')
 	{
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)
 	{
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
 	 * @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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -63,63 +63,63 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	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');
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			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);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
 	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))
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
 		$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;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
 
 		// 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;
 			}
 		}
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
 				// 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);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
 			// 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);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.3-Input.php 2 patches

Doc Comments +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -233,7 +233,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
 	{
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	public function __get($name)
 	{

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -137,17 +137,17 @@  discard block
 block discarded – undo
 	 */
 	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
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
 
 		// Save cookie in Output object
 		// added by ci-phpunit-test
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$output = $CI->output;
 		$output->_cookies[$prefix.$name][] = [
 			'value' => $value,

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.3-Loader.php 2 patches

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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|null
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
 	 *					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 = '')
 	{
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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 = '')
 	{
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)
 	{
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
 	 * @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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -63,63 +63,63 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	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');
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			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);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
 	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))
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
 		$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;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
 
 		// 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;
 			}
 		}
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
 				// 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);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
 			// 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);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.4-Input.php 2 patches

Doc Comments +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -233,7 +233,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
 	{
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	public function __get($name)
 	{

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -137,17 +137,17 @@  discard block
 block discarded – undo
 	 */
 	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
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
 
 		// Save cookie in Output object
 		// added by ci-phpunit-test
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$output = $CI->output;
 		$output->_cookies[$prefix.$name][] = [
 			'value' => $value,

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.4-Loader.php 2 patches

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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|null
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
 	 *					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 = '')
 	{
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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 = '')
 	{
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)
 	{
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
 	 * @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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -63,63 +63,63 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	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');
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			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);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
 	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))
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
 		$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;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
 
 		// 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;
 			}
 		}
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
 				// 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);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
 			// 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);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.0.5-Loader.php 2 patches

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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|null
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
 	/**
 	 * 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)
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
 	 *					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 = '')
 	{
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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 = '')
 	{
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)
 	{
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
 	 * @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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -63,63 +63,63 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	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');
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			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);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
 	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))
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
 	 */
 	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');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
 		$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;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
 
 		// 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;
 			}
 		}
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
 				// 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);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
 			// 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);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/replacing/core/3.1.0-Common.php 2 patches

Doc Comments +8 added lines patch added patch discarded remove patch

@@ -136,6 +136,11 @@  discard block
 block discarded – undo
 	return $_is_loaded;
 }
 
+/**
+ * @param boolean $return
+ *
+ * @return boolean
+ */
 function is_cli($return = null)
 {
 	static $_return = TRUE;
@@ -148,6 +153,9 @@  discard block
 block discarded – undo
 	return $_return;
 }
 
+/**
+ * @param string $message
+ */
 function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 {
 	$status_code = abs($status_code);

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -263,7 +263,7 @@  discard block
 block discarded – undo
 
 	// Save status code in Output object
 	// added by ci-phpunit-test
-	$CI =& get_instance();
+	$CI = & get_instance();
 	$output = $CI->output;
 	$output->_status = [
 		'code'     => $code,
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
 	if (empty($_config))
 	{
 		// references cannot be directly assigned to static variables, so we use an array
-		$_config[0] =& get_config();
+		$_config[0] = & get_config();
 	}
 
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;

Please login to merge, or discard this patch.

		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	* @param string $library Library name
186	186	* @param array $params Optional parameters to pass to the library class constructor
187	187	* @param string $object_name An optional object name to assign to
188		- * @return object
	188	+ * @return CI_Loader
189	189	*/
190	190	public function library($library, $params = NULL, $object_name = NULL)
191	191	{
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	* @param string $model Model name
230	230	* @param string $name An optional object name to assign to
231	231	* @param bool $db_conn An optional database connection configuration to initialize
232		- * @return object
	232	+ * @return CI_Loader\|null
233	233	*
234	234	* modified by ci-phpunit-test
235	235	*/
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	/**
318	318	* Database Loader
319	319	*
320		- * @param mixed $params Database configuration options
	320	+ * @param string\|boolean $params Database configuration options
321	321	* @param bool $return Whether to return the database object
322	322	* @param bool $query_builder Whether to enable Query Builder
323	323	* (overrides the configuration setting)
		@@ -473,7 +473,7 @@ discard block
		block discarded – undo
473	473	* An associative array or object containing values
474	474	* to be set, or a value's name if string
475	475	* @param string $val Value to set, only used if $vars is a string
476		- * @return object
	476	+ * @return CI_Loader
477	477	*/
478	478	public function vars($vars, $val = '')
479	479	{
		@@ -502,7 +502,7 @@ discard block
		block discarded – undo
502	502	*
503	503	* Clears the cached variables.
504	504	*
505		- * @return object
	505	+ * @return CI_Loader
506	506	*/
507	507	public function clear_vars()
508	508	{
		@@ -545,7 +545,7 @@ discard block
		block discarded – undo
545	545	* Helper Loader
546	546	*
547	547	* @param string\|string[] $helpers Helper name(s)
548		- * @return object
	548	+ * @return CI_Loader
549	549	*/
550	550	public function helper($helpers = array())
551	551	{
		@@ -616,7 +616,7 @@ discard block
		block discarded – undo
616	616	*
617	617	* @uses CI_Loader::helper()
618	618	* @param string\|string[] $helpers Helper name(s)
619		- * @return object
	619	+ * @return CI_Loader
620	620	*/
621	621	public function helpers($helpers = array())
622	622	{
		@@ -632,7 +632,7 @@ discard block
		block discarded – undo
632	632	*
633	633	* @param string\|string[] $files List of language file names to load
634	634	* @param string Language name
635		- * @return object
	635	+ * @return CI_Loader
636	636	*/
637	637	public function language($files, $lang = '')
638	638	{
		@@ -719,7 +719,7 @@ discard block
		block discarded – undo
719	719	*
720	720	* @param string $path Path to add
721	721	* @param bool $view_cascade (default: TRUE)
722		- * @return object
	722	+ * @return CI_Loader
723	723	*/
724	724	public function add_package_path($path, $view_cascade = TRUE)
725	725	{
		@@ -763,7 +763,7 @@ discard block
		block discarded – undo
763	763	* added path will be removed removed.
764	764	*
765	765	* @param string $path Path to remove
766		- * @return object
	766	+ * @return CI_Loader
767	767	*/
768	768	public function remove_package_path($path = '')
769	769	{
		@@ -1051,7 +1051,7 @@ discard block
		block discarded – undo
1051	1051	* @used-by CI_Loader::_ci_load_library()
1052	1052	* @uses CI_Loader::_ci_init_library()
1053	1053	*
1054		- * @param string $library Library name to load
	1054	+ * @param string $library_name Library name to load
1055	1055	* @param string $file_path Path to the library filename, relative to libraries/
1056	1056	* @param mixed $params Optional parameters to pass to the class constructor
1057	1057	* @param string $object_name Optional object name to assign to

		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233	/**
234	234	* Fetch an item from the GET array
235	235	*
236		- * @param mixed $index Index for item to be fetched from $_GET
	236	+ * @param string $index Index for item to be fetched from $_GET
237	237	* @param bool $xss_clean Whether to apply XSS filtering
238	238	* @return mixed
239	239	*/
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	/**
248	248	* Fetch an item from the POST array
249	249	*
250		- * @param mixed $index Index for item to be fetched from $_POST
	250	+ * @param string $index Index for item to be fetched from $_POST
251	251	* @param bool $xss_clean Whether to apply XSS filtering
252	252	* @return mixed
253	253	*/
		@@ -307,9 +307,9 @@ discard block
		block discarded – undo
307	307	/**
308	308	* Fetch an item from the SERVER array
309	309	*
310		- * @param mixed $index Index for item to be fetched from $_SERVER
	310	+ * @param string $index Index for item to be fetched from $_SERVER
311	311	* @param bool $xss_clean Whether to apply XSS filtering
312		- * @return mixed
	312	+ * @return string
313	313	*/
314	314	public function server($index, $xss_clean = NULL)
315	315	{
		@@ -892,7 +892,7 @@ discard block
		block discarded – undo
892	892	* Allows read access to protected properties
893	893	*
894	894	* @param string $name
895		- * @return mixed
	895	+ * @return string\|null
896	896	*/
897	897	public function __get($name)
898	898	{

		@@ -137,17 +137,17 @@ discard block
		block discarded – undo
137	137	*/
138	138	public function __construct()
139	139	{
140		- $this->_allow_get_array = (config_item('allow_get_array') === TRUE);
141		- $this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
142		- $this->_enable_csrf = (config_item('csrf_protection') === TRUE);
143		- $this->_standardize_newlines = (bool) config_item('standardize_newlines');
	140	+ $this->_allow_get_array = (config_item('allow_get_array') === TRUE);
	141	+ $this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
	142	+ $this->_enable_csrf = (config_item('csrf_protection') === TRUE);
	143	+ $this->_standardize_newlines = (bool) config_item('standardize_newlines');
144	144
145		- $this->security =& load_class('Security', 'core');
	145	+ $this->security = & load_class('Security', 'core');
146	146
147	147	// Do we need the UTF-8 class?
148	148	if (UTF8_ENABLED === TRUE)
149	149	{
150		- $this->uni =& load_class('Utf8', 'core');
	150	+ $this->uni = & load_class('Utf8', 'core');
151	151	}
152	152
153	153	// Sanitize global arrays
		@@ -413,7 +413,7 @@ discard block
		block discarded – undo
413	413
414	414	// Save cookie in Output object
415	415	// added by ci-phpunit-test
416		- $CI =& get_instance();
	416	+ $CI = & get_instance();
417	417	$output = $CI->output;
418	418	$output->_cookies[$prefix.$name][] = [
419	419	'value' => $value,

		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233	/**
234	234	* Fetch an item from the GET array
235	235	*
236		- * @param mixed $index Index for item to be fetched from $_GET
	236	+ * @param string $index Index for item to be fetched from $_GET
237	237	* @param bool $xss_clean Whether to apply XSS filtering
238	238	* @return mixed
239	239	*/
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	/**
248	248	* Fetch an item from the POST array
249	249	*
250		- * @param mixed $index Index for item to be fetched from $_POST
	250	+ * @param string $index Index for item to be fetched from $_POST
251	251	* @param bool $xss_clean Whether to apply XSS filtering
252	252	* @return mixed
253	253	*/
		@@ -307,9 +307,9 @@ discard block
		block discarded – undo
307	307	/**
308	308	* Fetch an item from the SERVER array
309	309	*
310		- * @param mixed $index Index for item to be fetched from $_SERVER
	310	+ * @param string $index Index for item to be fetched from $_SERVER
311	311	* @param bool $xss_clean Whether to apply XSS filtering
312		- * @return mixed
	312	+ * @return string
313	313	*/
314	314	public function server($index, $xss_clean = NULL)
315	315	{
		@@ -892,7 +892,7 @@ discard block
		block discarded – undo
892	892	* Allows read access to protected properties
893	893	*
894	894	* @param string $name
895		- * @return mixed
	895	+ * @return string\|null
896	896	*/
897	897	public function __get($name)
898	898	{

		@@ -137,17 +137,17 @@ discard block
		block discarded – undo
137	137	*/
138	138	public function __construct()
139	139	{
140		- $this->_allow_get_array = (config_item('allow_get_array') === TRUE);
141		- $this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
142		- $this->_enable_csrf = (config_item('csrf_protection') === TRUE);
143		- $this->_standardize_newlines = (bool) config_item('standardize_newlines');
	140	+ $this->_allow_get_array = (config_item('allow_get_array') === TRUE);
	141	+ $this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
	142	+ $this->_enable_csrf = (config_item('csrf_protection') === TRUE);
	143	+ $this->_standardize_newlines = (bool) config_item('standardize_newlines');
144	144
145		- $this->security =& load_class('Security', 'core');
	145	+ $this->security = & load_class('Security', 'core');
146	146
147	147	// Do we need the UTF-8 class?
148	148	if (UTF8_ENABLED === TRUE)
149	149	{
150		- $this->uni =& load_class('Utf8', 'core');
	150	+ $this->uni = & load_class('Utf8', 'core');
151	151	}
152	152
153	153	// Sanitize global arrays
		@@ -413,7 +413,7 @@ discard block
		block discarded – undo
413	413
414	414	// Save cookie in Output object
415	415	// added by ci-phpunit-test
416		- $CI =& get_instance();
	416	+ $CI = & get_instance();
417	417	$output = $CI->output;
418	418	$output->_cookies[$prefix.$name][] = [
419	419	'value' => $value,

		@@ -136,6 +136,11 @@ discard block
		block discarded – undo
136	136	return $_is_loaded;
137	137	}
138	138
	139	+/**
	140	+ * @param boolean $return
	141	+ *
	142	+ * @return boolean
	143	+ */
139	144	function is_cli($return = null)
140	145	{
141	146	static $_return = TRUE;
		@@ -148,6 +153,9 @@ discard block
		block discarded – undo
148	153	return $_return;
149	154	}
150	155
	156	+/**
	157	+ * @param string $message
	158	+ */
151	159	function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
152	160	{
153	161	$status_code = abs($status_code);

		@@ -263,7 +263,7 @@ discard block
		block discarded – undo
263	263
264	264	// Save status code in Output object
265	265	// added by ci-phpunit-test
266		- $CI =& get_instance();
	266	+ $CI = & get_instance();
267	267	$output = $CI->output;
268	268	$output->_status = [
269	269	'code' => $code,
		@@ -376,7 +376,7 @@ discard block
		block discarded – undo
376	376	if (empty($_config))
377	377	{
378	378	// references cannot be directly assigned to static variables, so we use an array
379		- $_config[0] =& get_config();
	379	+ $_config[0] = & get_config();
380	380	}
381	381
382	382	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;

		@@ -63,63 +63,63 @@ discard block
		block discarded – undo
63	63	*
64	64	* @var array
65	65	*/
66		- protected $_ci_view_paths = array(VIEWPATH => TRUE);
	66	+ protected $_ci_view_paths = array(VIEWPATH => TRUE);
67	67
68	68	/**
69	69	* List of paths to load libraries from
70	70	*
71	71	* @var array
72	72	*/
73		- protected $_ci_library_paths = array(APPPATH, BASEPATH);
	73	+ protected $_ci_library_paths = array(APPPATH, BASEPATH);
74	74
75	75	/**
76	76	* List of paths to load models from
77	77	*
78	78	* @var array
79	79	*/
80		- protected $_ci_model_paths = array(APPPATH);
	80	+ protected $_ci_model_paths = array(APPPATH);
81	81
82	82	/**
83	83	* List of paths to load helpers from
84	84	*
85	85	* @var array
86	86	*/
87		- protected $_ci_helper_paths = array(APPPATH, BASEPATH);
	87	+ protected $_ci_helper_paths = array(APPPATH, BASEPATH);
88	88
89	89	/**
90	90	* List of cached variables
91	91	*
92	92	* @var array
93	93	*/
94		- protected $_ci_cached_vars = array();
	94	+ protected $_ci_cached_vars = array();
95	95
96	96	/**
97	97	* List of loaded classes
98	98	*
99	99	* @var array
100	100	*/
101		- protected $_ci_classes = array();
	101	+ protected $_ci_classes = array();
102	102
103	103	/**
104	104	* List of loaded models
105	105	*
106	106	* @var array
107	107	*/
108		- protected $_ci_models = array();
	108	+ protected $_ci_models = array();
109	109
110	110	/**
111	111	* List of loaded helpers
112	112	*
113	113	* @var array
114	114	*/
115		- protected $_ci_helpers = array();
	115	+ protected $_ci_helpers = array();
116	116
117	117	/**
118	118	* List of class name mappings
119	119	*
120	120	* @var array
121	121	*/
122		- protected $_ci_varmap = array(
	122	+ protected $_ci_varmap = array(
123	123	'unit_test' => 'unit',
124	124	'user_agent' => 'agent'
125	125	);
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	public function __construct()
137	137	{
138	138	$this->_ci_ob_level = ob_get_level();
139		- $this->_ci_classes =& is_loaded();
	139	+ $this->_ci_classes = & is_loaded();
140	140
141	141	log_message('info', 'Loader Class Initialized');
142	142	}
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	return $this;
272	272	}
273	273
274		- $CI =& get_instance();
	274	+ $CI = & get_instance();
275	275	if (isset($CI->$name))
276	276	{
277	277	show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
		@@ -328,7 +328,7 @@ discard block
		block discarded – undo
328	328	public function database($params = '', $return = FALSE, $query_builder = NULL)
329	329	{
330	330	// Grab the super object
331		- $CI =& get_instance();
	331	+ $CI = & get_instance();
332	332
333	333	// Do we even need to load the database class?
334	334	if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	$CI->db = '';
349	349
350	350	// Load the DB class
351		- $CI->db =& DB($params, $query_builder);
	351	+ $CI->db = & DB($params, $query_builder);
352	352	return $this;
353	353	}
354	354
		@@ -363,12 +363,12 @@ discard block
		block discarded – undo
363	363	*/
364	364	public function dbutil($db = NULL, $return = FALSE)
365	365	{
366		- $CI =& get_instance();
	366	+ $CI = & get_instance();
367	367
368	368	if ( ! is_object($db) OR ! ($db instanceof CI_DB))
369	369	{
370	370	class_exists('CI_DB', FALSE) OR $this->database();
371		- $db =& $CI->db;
	371	+ $db = & $CI->db;
372	372	}
373	373
374	374	require_once(BASEPATH.'database/DB_utility.php');
		@@ -395,11 +395,11 @@ discard block
		block discarded – undo
395	395	*/
396	396	public function dbforge($db = NULL, $return = FALSE)
397	397	{
398		- $CI =& get_instance();
	398	+ $CI = & get_instance();
399	399	if ( ! is_object($db) OR ! ($db instanceof CI_DB))
400	400	{
401	401	class_exists('CI_DB', FALSE) OR $this->database();
402		- $db =& $CI->db;
	402	+ $db = & $CI->db;
403	403	}
404	404
405	405	require_once(BASEPATH.'database/DB_forge.php');
		@@ -732,7 +732,7 @@ discard block
		block discarded – undo
732	732	$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
733	733
734	734	// Add config file path
735		- $config =& $this->_ci_get_component('config');
	735	+ $config = & $this->_ci_get_component('config');
736	736	$config->_config_paths[] = $path;
737	737
738	738	return $this;
		@@ -767,7 +767,7 @@ discard block
		block discarded – undo
767	767	*/
768	768	public function remove_package_path($path = '')
769	769	{
770		- $config =& $this->_ci_get_component('config');
	770	+ $config = & $this->_ci_get_component('config');
771	771
772	772	if ($path === '')
773	773	{
		@@ -868,12 +868,12 @@ discard block
		block discarded – undo
868	868
869	869	// This allows anything loaded using $this->load (views, files, etc.)
870	870	// to become accessible from within the Controller and Model functions.
871		- $_ci_CI =& get_instance();
	871	+ $_ci_CI = & get_instance();
872	872	foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
873	873	{
874	874	if ( ! isset($this->$_ci_key))
875	875	{
876		- $this->$_ci_key =& $_ci_CI->$_ci_key;
	876	+ $this->$_ci_key = & $_ci_CI->$_ci_key;
877	877	}
878	878	}
879	879
		@@ -1012,7 +1012,7 @@ discard block
		block discarded – undo
1012	1012	// return a new instance of the object
1013	1013	if ($object_name !== NULL)
1014	1014	{
1015		- $CI =& get_instance();
	1015	+ $CI = & get_instance();
1016	1016	if ( ! isset($CI->$object_name))
1017	1017	{
1018	1018	return $this->_ci_init_library($class, '', $params, $object_name);
		@@ -1075,7 +1075,7 @@ discard block
		block discarded – undo
1075	1075	// return a new instance of the object
1076	1076	if ($object_name !== NULL)
1077	1077	{
1078		- $CI =& get_instance();
	1078	+ $CI = & get_instance();
1079	1079	if ( ! isset($CI->$object_name))
1080	1080	{
1081	1081	return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
		@@ -1218,7 +1218,7 @@ discard block
		block discarded – undo
1218	1218	}
1219	1219
1220	1220	// Don't overwrite existing properties
1221		- $CI =& get_instance();
	1221	+ $CI = & get_instance();
1222	1222	if (isset($CI->$object_name))
1223	1223	{
1224	1224	if ($CI->$object_name instanceof $class_name)
		@@ -1354,7 +1354,7 @@ discard block
		block discarded – undo
1354	1354	*/
1355	1355	protected function &_ci_get_component($component)
1356	1356	{
1357		- $CI =& get_instance();
	1357	+ $CI = & get_instance();
1358	1358	return $CI->$component;
1359	1359	}
1360	1360

kenjis / ci-phpunit-test

Push — master ( 96358b...5204ad )

Status

Category

Doc Comments +8 added lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Doc Comments +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +8 added lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch