Completed
Push — master ( 5204ad...e27a57 )
by Kenji
03:55 queued 56s
created
application/tests/_ci_phpunit_test/replacing/core/3.1.2-Loader.php 3 patches
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 	 * @param	string	$library	Library name
192 192
 	 * @param	array	$params		Optional parameters to pass to the library class constructor
193 193
 	 * @param	string	$object_name	An optional object name to assign to
194
-	 * @return	object
194
+	 * @return	CI_Loader
195 195
 	 *
196 196
 	 * @codeCoverageIgnore
197 197
 	 */
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 * @param	string	$model		Model name
238 238
 	 * @param	string	$name		An optional object name to assign to
239 239
 	 * @param	bool	$db_conn	An optional database connection configuration to initialize
240
-	 * @return	object
240
+	 * @return	CI_Loader|null
241 241
 	 * 
242 242
 	 * modified by ci-phpunit-test
243 243
 	 */
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	/**
370 370
 	 * Database Loader
371 371
 	 *
372
-	 * @param	mixed	$params		Database configuration options
372
+	 * @param	string|boolean	$params		Database configuration options
373 373
 	 * @param	bool	$return 	Whether to return the database object
374 374
 	 * @param	bool	$query_builder	Whether to enable Query Builder
375 375
 	 *					(overrides the configuration setting)
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 	 *					An associative array or object containing values
536 536
 	 *					to be set, or a value's name if string
537 537
 	 * @param 	string	$val	Value to set, only used if $vars is a string
538
-	 * @return	object
538
+	 * @return	CI_Loader
539 539
 	 *
540 540
 	 * @codeCoverageIgnore
541 541
 	 */
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
 	 * Helper Loader
616 616
 	 *
617 617
 	 * @param	string|string[]	$helpers	Helper name(s)
618
-	 * @return	object
618
+	 * @return	CI_Loader
619 619
 	 *
620 620
 	 * @codeCoverageIgnore
621 621
 	 */
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 	 *
689 689
 	 * @uses	CI_Loader::helper()
690 690
 	 * @param	string|string[]	$helpers	Helper name(s)
691
-	 * @return	object
691
+	 * @return	CI_Loader
692 692
 	 *
693 693
 	 * @codeCoverageIgnore
694 694
 	 */
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 	 *
707 707
 	 * @param	string|string[]	$files	List of language file names to load
708 708
 	 * @param	string		Language name
709
-	 * @return	object
709
+	 * @return	CI_Loader
710 710
 	 *
711 711
 	 * @codeCoverageIgnore
712 712
 	 */
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 	 *
807 807
 	 * @param	string	$path		Path to add
808 808
 	 * @param 	bool	$view_cascade	(default: TRUE)
809
-	 * @return	object
809
+	 * @return	CI_Loader
810 810
 	 *
811 811
 	 * @codeCoverageIgnore
812 812
 	 */
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 	 * added path will be removed removed.
855 855
 	 *
856 856
 	 * @param	string	$path	Path to remove
857
-	 * @return	object
857
+	 * @return	CI_Loader
858 858
 	 *
859 859
 	 * @codeCoverageIgnore
860 860
 	 */
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
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
 			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
342 342
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
343 343
 	{
344 344
 		// Grab the super object
345
-		$CI =& get_instance();
345
+		$CI = & get_instance();
346 346
 
347 347
 		// Do we even need to load the database class?
348 348
 		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
362 362
 		$CI->db = '';
363 363
 
364 364
 		// Load the DB class
365
-		$CI->db =& DB($params, $query_builder);
365
+		$CI->db = & DB($params, $query_builder);
366 366
 		return $this;
367 367
 	}
368 368
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function dbutil($db = NULL, $return = FALSE)
379 379
 	{
380
-		$CI =& get_instance();
380
+		$CI = & get_instance();
381 381
 
382 382
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
383 383
 		{
384 384
 			class_exists('CI_DB', FALSE) OR $this->database();
385
-			$db =& $CI->db;
385
+			$db = & $CI->db;
386 386
 		}
387 387
 
388 388
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function dbforge($db = NULL, $return = FALSE)
411 411
 	{
412
-		$CI =& get_instance();
412
+		$CI = & get_instance();
413 413
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
414 414
 		{
415 415
 			class_exists('CI_DB', FALSE) OR $this->database();
416
-			$db =& $CI->db;
416
+			$db = & $CI->db;
417 417
 		}
418 418
 
419 419
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
747 747
 
748 748
 		// Add config file path
749
-		$config =& $this->_ci_get_component('config');
749
+		$config = & $this->_ci_get_component('config');
750 750
 		$config->_config_paths[] = $path;
751 751
 
752 752
 		return $this;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
784
-		$config =& $this->_ci_get_component('config');
784
+		$config = & $this->_ci_get_component('config');
785 785
 
786 786
 		if ($path === '')
787 787
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
882 882
 
883 883
 		// This allows anything loaded using $this->load (views, files, etc.)
884 884
 		// to become accessible from within the Controller and Model functions.
885
-		$_ci_CI =& get_instance();
885
+		$_ci_CI = & get_instance();
886 886
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
887 887
 		{
888 888
 			if ( ! isset($this->$_ci_key))
889 889
 			{
890
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
890
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
891 891
 			}
892 892
 		}
893 893
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 				// return a new instance of the object
1027 1027
 				if ($object_name !== NULL)
1028 1028
 				{
1029
-					$CI =& get_instance();
1029
+					$CI = & get_instance();
1030 1030
 					if ( ! isset($CI->$object_name))
1031 1031
 					{
1032 1032
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			// return a new instance of the object
1090 1090
 			if ($object_name !== NULL)
1091 1091
 			{
1092
-				$CI =& get_instance();
1092
+				$CI = & get_instance();
1093 1093
 				if ( ! isset($CI->$object_name))
1094 1094
 				{
1095 1095
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
 		}
1233 1233
 
1234 1234
 		// Don't overwrite existing properties
1235
-		$CI =& get_instance();
1235
+		$CI = & get_instance();
1236 1236
 		if (isset($CI->$object_name))
1237 1237
 		{
1238 1238
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 */
1366 1366
 	protected function &_ci_get_component($component)
1367 1367
 	{
1368
-		$CI =& get_instance();
1368
+		$CI = & get_instance();
1369 1369
 		return $CI->$component;
1370 1370
 	}
1371 1371
 
Please login to merge, or discard this patch.
Braces   +17 added lines, -34 removed lines patch added patch discarded remove patch
@@ -192,16 +192,14 @@  discard block
 block discarded – undo
192 192
 		if (empty($library))
193 193
 		{
194 194
 			return $this;
195
-		}
196
-		elseif (is_array($library))
195
+		} elseif (is_array($library))
197 196
 		{
198 197
 			foreach ($library as $key => $value)
199 198
 			{
200 199
 				if (is_int($key))
201 200
 				{
202 201
 					$this->library($value, $params);
203
-				}
204
-				else
202
+				} else
205 203
 				{
206 204
 					$this->library($key, $params, $value);
207 205
 				}
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
 		if (empty($model))
239 237
 		{
240 238
 			return $this;
241
-		}
242
-		elseif (is_array($model))
239
+		} elseif (is_array($model))
243 240
 		{
244 241
 			foreach ($model as $key => $value)
245 242
 			{
@@ -305,8 +302,7 @@  discard block
 block discarded – undo
305 302
 				{
306 303
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
307 304
 				}
308
-			}
309
-			elseif ( ! class_exists('CI_Model', FALSE))
305
+			} elseif ( ! class_exists('CI_Model', FALSE))
310 306
 			{
311 307
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
312 308
 			}
@@ -457,8 +453,7 @@  discard block
 block discarded – undo
457 453
 				require_once($driver_path);
458 454
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
459 455
 			}
460
-		}
461
-		else
456
+		} else
462 457
 		{
463 458
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
464 459
 		}
@@ -725,16 +720,14 @@  discard block
 block discarded – undo
725 720
 				if (is_int($key))
726 721
 				{
727 722
 					$this->driver($value, $params);
728
-				}
729
-				else
723
+				} else
730 724
 				{
731 725
 					$this->driver($key, $params, $value);
732 726
 				}
733 727
 			}
734 728
 
735 729
 			return $this;
736
-		}
737
-		elseif (empty($library))
730
+		} elseif (empty($library))
738 731
 		{
739 732
 			return FALSE;
740 733
 		}
@@ -827,8 +820,7 @@  discard block
 block discarded – undo
827 820
 			array_shift($this->_ci_helper_paths);
828 821
 			array_shift($this->_ci_view_paths);
829 822
 			array_pop($config->_config_paths);
830
-		}
831
-		else
823
+		} else
832 824
 		{
833 825
 			$path = rtrim($path, '/').'/';
834 826
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -890,8 +882,7 @@  discard block
 block discarded – undo
890 882
 		{
891 883
 			$_ci_x = explode('/', $_ci_path);
892 884
 			$_ci_file = end($_ci_x);
893
-		}
894
-		else
885
+		} else
895 886
 		{
896 887
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
897 888
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -969,8 +960,7 @@  discard block
 block discarded – undo
969 960
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
970 961
 		{
971 962
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
972
-		}
973
-		else
963
+		} else
974 964
 		{
975 965
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
976 966
 		}
@@ -997,8 +987,7 @@  discard block
 block discarded – undo
997 987
 		if (ob_get_level() > $this->_ci_ob_level + 1)
998 988
 		{
999 989
 			ob_end_flush();
1000
-		}
1001
-		else
990
+		} else
1002 991
 		{
1003 992
 			$_ci_CI->output->append_output(ob_get_contents());
1004 993
 			@ob_end_clean();
@@ -1038,8 +1027,7 @@  discard block
 block discarded – undo
1038 1027
 
1039 1028
 			// Get the filename from the path
1040 1029
 			$class = substr($class, $last_slash);
1041
-		}
1042
-		else
1030
+		} else
1043 1031
 		{
1044 1032
 			$subdir = '';
1045 1033
 		}
@@ -1177,8 +1165,7 @@  discard block
 block discarded – undo
1177 1165
 		if (file_exists(APPPATH.'tests/_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php'))
1178 1166
 		{
1179 1167
 			include_once(APPPATH.'tests/_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php');
1180
-		}
1181
-		else
1168
+		} else
1182 1169
 		{
1183 1170
 			include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php');
1184 1171
 		}
@@ -1194,8 +1181,7 @@  discard block
 block discarded – undo
1194 1181
 				{
1195 1182
 					$prefix = config_item('subclass_prefix');
1196 1183
 					break;
1197
-				}
1198
-				else
1184
+				} else
1199 1185
 				{
1200 1186
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
1201 1187
 				}
@@ -1242,8 +1228,7 @@  discard block
 block discarded – undo
1242 1228
 					{
1243 1229
 						include($path.'config/'.strtolower($class).'.php');
1244 1230
 						$found = TRUE;
1245
-					}
1246
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1231
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1247 1232
 					{
1248 1233
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1249 1234
 						$found = TRUE;
@@ -1253,8 +1238,7 @@  discard block
 block discarded – undo
1253 1238
 					{
1254 1239
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1255 1240
 						$found = TRUE;
1256
-					}
1257
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1241
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1258 1242
 					{
1259 1243
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1260 1244
 						$found = TRUE;
@@ -1442,8 +1426,7 @@  discard block
 block discarded – undo
1442 1426
 		if ( ! is_array($filename))
1443 1427
 		{
1444 1428
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
1445
-		}
1446
-		else
1429
+		} else
1447 1430
 		{
1448 1431
 			foreach ($filename as $key => $val)
1449 1432
 			{
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.3-CodeIgniter.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,16 +419,14 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
@@ -475,8 +468,7 @@  discard block
 block discarded – undo
475 468
 						$RTR->directory = '';
476 469
 					}
477 470
 				}
478
-			}
479
-			else
471
+			} else
480 472
 			{
481 473
 				$e404 = FALSE;
482 474
 			}
@@ -492,8 +484,7 @@  discard block
 block discarded – undo
492 484
 				1 => $class,
493 485
 				2 => $method
494 486
 			);
495
-		}
496
-		else
487
+		} else
497 488
 		{
498 489
 			show_404($RTR->directory.$class.'/'.$method);
499 490
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.4-CodeIgniter.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,16 +419,14 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
@@ -475,8 +468,7 @@  discard block
 block discarded – undo
475 468
 						$RTR->directory = '';
476 469
 					}
477 470
 				}
478
-			}
479
-			else
471
+			} else
480 472
 			{
481 473
 				$e404 = FALSE;
482 474
 			}
@@ -492,8 +484,7 @@  discard block
 block discarded – undo
492 484
 				1 => $class,
493 485
 				2 => $method
494 486
 			);
495
-		}
496
-		else
487
+		} else
497 488
 		{
498 489
 			show_404($RTR->directory.$class.'/'.$method);
499 490
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.1.2-CodeIgniter.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,21 +419,18 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
440
-		}
441
-		elseif ( ! method_exists($class, $method))
433
+		} elseif ( ! method_exists($class, $method))
442 434
 		{
443 435
 			$e404 = TRUE;
444 436
 		}
@@ -490,8 +482,7 @@  discard block
 block discarded – undo
490 482
 						$RTR->directory = '';
491 483
 					}
492 484
 				}
493
-			}
494
-			else
485
+			} else
495 486
 			{
496 487
 				$e404 = FALSE;
497 488
 			}
@@ -507,8 +498,7 @@  discard block
 block discarded – undo
507 498
 				1 => $class,
508 499
 				2 => $method
509 500
 			);
510
-		}
511
-		else
501
+		} else
512 502
 		{
513 503
 			show_404($RTR->directory.$class.'/'.$method);
514 504
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.5-Loader.php 3 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -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
 			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
342 342
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
343 343
 	{
344 344
 		// Grab the super object
345
-		$CI =& get_instance();
345
+		$CI = & get_instance();
346 346
 
347 347
 		// Do we even need to load the database class?
348 348
 		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
362 362
 		$CI->db = '';
363 363
 
364 364
 		// Load the DB class
365
-		$CI->db =& DB($params, $query_builder);
365
+		$CI->db = & DB($params, $query_builder);
366 366
 		return $this;
367 367
 	}
368 368
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function dbutil($db = NULL, $return = FALSE)
379 379
 	{
380
-		$CI =& get_instance();
380
+		$CI = & get_instance();
381 381
 
382 382
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
383 383
 		{
384 384
 			class_exists('CI_DB', FALSE) OR $this->database();
385
-			$db =& $CI->db;
385
+			$db = & $CI->db;
386 386
 		}
387 387
 
388 388
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function dbforge($db = NULL, $return = FALSE)
411 411
 	{
412
-		$CI =& get_instance();
412
+		$CI = & get_instance();
413 413
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
414 414
 		{
415 415
 			class_exists('CI_DB', FALSE) OR $this->database();
416
-			$db =& $CI->db;
416
+			$db = & $CI->db;
417 417
 		}
418 418
 
419 419
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
747 747
 
748 748
 		// Add config file path
749
-		$config =& $this->_ci_get_component('config');
749
+		$config = & $this->_ci_get_component('config');
750 750
 		$config->_config_paths[] = $path;
751 751
 
752 752
 		return $this;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
784
-		$config =& $this->_ci_get_component('config');
784
+		$config = & $this->_ci_get_component('config');
785 785
 
786 786
 		if ($path === '')
787 787
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
882 882
 
883 883
 		// This allows anything loaded using $this->load (views, files, etc.)
884 884
 		// to become accessible from within the Controller and Model functions.
885
-		$_ci_CI =& get_instance();
885
+		$_ci_CI = & get_instance();
886 886
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
887 887
 		{
888 888
 			if ( ! isset($this->$_ci_key))
889 889
 			{
890
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
890
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
891 891
 			}
892 892
 		}
893 893
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 				// return a new instance of the object
1027 1027
 				if ($object_name !== NULL)
1028 1028
 				{
1029
-					$CI =& get_instance();
1029
+					$CI = & get_instance();
1030 1030
 					if ( ! isset($CI->$object_name))
1031 1031
 					{
1032 1032
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			// return a new instance of the object
1090 1090
 			if ($object_name !== NULL)
1091 1091
 			{
1092
-				$CI =& get_instance();
1092
+				$CI = & get_instance();
1093 1093
 				if ( ! isset($CI->$object_name))
1094 1094
 				{
1095 1095
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
 		}
1233 1233
 
1234 1234
 		// Don't overwrite existing properties
1235
-		$CI =& get_instance();
1235
+		$CI = & get_instance();
1236 1236
 		if (isset($CI->$object_name))
1237 1237
 		{
1238 1238
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 */
1366 1366
 	protected function &_ci_get_component($component)
1367 1367
 	{
1368
-		$CI =& get_instance();
1368
+		$CI = & get_instance();
1369 1369
 		return $CI->$component;
1370 1370
 	}
1371 1371
 
Please login to merge, or discard this patch.
Braces   +16 added lines, -32 removed lines patch added patch discarded remove patch
@@ -192,16 +192,14 @@  discard block
 block discarded – undo
192 192
 		if (empty($library))
193 193
 		{
194 194
 			return $this;
195
-		}
196
-		elseif (is_array($library))
195
+		} elseif (is_array($library))
197 196
 		{
198 197
 			foreach ($library as $key => $value)
199 198
 			{
200 199
 				if (is_int($key))
201 200
 				{
202 201
 					$this->library($value, $params);
203
-				}
204
-				else
202
+				} else
205 203
 				{
206 204
 					$this->library($key, $params, $value);
207 205
 				}
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
 		if (empty($model))
239 237
 		{
240 238
 			return $this;
241
-		}
242
-		elseif (is_array($model))
239
+		} elseif (is_array($model))
243 240
 		{
244 241
 			foreach ($model as $key => $value)
245 242
 			{
@@ -305,8 +302,7 @@  discard block
 block discarded – undo
305 302
 				{
306 303
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
307 304
 				}
308
-			}
309
-			elseif ( ! class_exists('CI_Model', FALSE))
305
+			} elseif ( ! class_exists('CI_Model', FALSE))
310 306
 			{
311 307
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
312 308
 			}
@@ -457,8 +453,7 @@  discard block
 block discarded – undo
457 453
 				require_once($driver_path);
458 454
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
459 455
 			}
460
-		}
461
-		else
456
+		} else
462 457
 		{
463 458
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
464 459
 		}
@@ -725,16 +720,14 @@  discard block
 block discarded – undo
725 720
 				if (is_int($key))
726 721
 				{
727 722
 					$this->driver($value, $params);
728
-				}
729
-				else
723
+				} else
730 724
 				{
731 725
 					$this->driver($key, $params, $value);
732 726
 				}
733 727
 			}
734 728
 
735 729
 			return $this;
736
-		}
737
-		elseif (empty($library))
730
+		} elseif (empty($library))
738 731
 		{
739 732
 			return FALSE;
740 733
 		}
@@ -827,8 +820,7 @@  discard block
 block discarded – undo
827 820
 			array_shift($this->_ci_helper_paths);
828 821
 			array_shift($this->_ci_view_paths);
829 822
 			array_pop($config->_config_paths);
830
-		}
831
-		else
823
+		} else
832 824
 		{
833 825
 			$path = rtrim($path, '/').'/';
834 826
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -890,8 +882,7 @@  discard block
 block discarded – undo
890 882
 		{
891 883
 			$_ci_x = explode('/', $_ci_path);
892 884
 			$_ci_file = end($_ci_x);
893
-		}
894
-		else
885
+		} else
895 886
 		{
896 887
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
897 888
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -969,8 +960,7 @@  discard block
 block discarded – undo
969 960
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
970 961
 		{
971 962
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
972
-		}
973
-		else
963
+		} else
974 964
 		{
975 965
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
976 966
 		}
@@ -997,8 +987,7 @@  discard block
 block discarded – undo
997 987
 		if (ob_get_level() > $this->_ci_ob_level + 1)
998 988
 		{
999 989
 			ob_end_flush();
1000
-		}
1001
-		else
990
+		} else
1002 991
 		{
1003 992
 			$_ci_CI->output->append_output(ob_get_contents());
1004 993
 			@ob_end_clean();
@@ -1038,8 +1027,7 @@  discard block
 block discarded – undo
1038 1027
 
1039 1028
 			// Get the filename from the path
1040 1029
 			$class = substr($class, $last_slash);
1041
-		}
1042
-		else
1030
+		} else
1043 1031
 		{
1044 1032
 			$subdir = '';
1045 1033
 		}
@@ -1180,8 +1168,7 @@  discard block
 block discarded – undo
1180 1168
 				{
1181 1169
 					$prefix = config_item('subclass_prefix');
1182 1170
 					break;
1183
-				}
1184
-				else
1171
+				} else
1185 1172
 				{
1186 1173
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
1187 1174
 				}
@@ -1228,8 +1215,7 @@  discard block
 block discarded – undo
1228 1215
 					{
1229 1216
 						include($path.'config/'.strtolower($class).'.php');
1230 1217
 						$found = TRUE;
1231
-					}
1232
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1218
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1233 1219
 					{
1234 1220
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1235 1221
 						$found = TRUE;
@@ -1239,8 +1225,7 @@  discard block
 block discarded – undo
1239 1225
 					{
1240 1226
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1241 1227
 						$found = TRUE;
1242
-					}
1243
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1228
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1244 1229
 					{
1245 1230
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1246 1231
 						$found = TRUE;
@@ -1428,8 +1413,7 @@  discard block
 block discarded – undo
1428 1413
 		if ( ! is_array($filename))
1429 1414
 		{
1430 1415
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
1431
-		}
1432
-		else
1416
+		} else
1433 1417
 		{
1434 1418
 			foreach ($filename as $key => $val)
1435 1419
 			{
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove 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
 	 */
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 	/**
332 332
 	 * Database Loader
333 333
 	 *
334
-	 * @param	mixed	$params		Database configuration options
334
+	 * @param	string|boolean	$params		Database configuration options
335 335
 	 * @param	bool	$return 	Whether to return the database object
336 336
 	 * @param	bool	$query_builder	Whether to enable Query Builder
337 337
 	 *					(overrides the configuration setting)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 	 *					An associative array or object containing values
488 488
 	 *					to be set, or a value's name if string
489 489
 	 * @param 	string	$val	Value to set, only used if $vars is a string
490
-	 * @return	object
490
+	 * @return	CI_Loader
491 491
 	 */
492 492
 	public function vars($vars, $val = '')
493 493
 	{
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 	 * Helper Loader
560 560
 	 *
561 561
 	 * @param	string|string[]	$helpers	Helper name(s)
562
-	 * @return	object
562
+	 * @return	CI_Loader
563 563
 	 */
564 564
 	public function helper($helpers = array())
565 565
 	{
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 	 *
631 631
 	 * @uses	CI_Loader::helper()
632 632
 	 * @param	string|string[]	$helpers	Helper name(s)
633
-	 * @return	object
633
+	 * @return	CI_Loader
634 634
 	 */
635 635
 	public function helpers($helpers = array())
636 636
 	{
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 	 *
647 647
 	 * @param	string|string[]	$files	List of language file names to load
648 648
 	 * @param	string		Language name
649
-	 * @return	object
649
+	 * @return	CI_Loader
650 650
 	 */
651 651
 	public function language($files, $lang = '')
652 652
 	{
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 	 *
734 734
 	 * @param	string	$path		Path to add
735 735
 	 * @param 	bool	$view_cascade	(default: TRUE)
736
-	 * @return	object
736
+	 * @return	CI_Loader
737 737
 	 */
738 738
 	public function add_package_path($path, $view_cascade = TRUE)
739 739
 	{
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 	 * added path will be removed removed.
778 778
 	 *
779 779
 	 * @param	string	$path	Path to remove
780
-	 * @return	object
780
+	 * @return	CI_Loader
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
1065 1065
 	 * @used-by	CI_Loader::_ci_load_library()
1066 1066
 	 * @uses	CI_Loader::_ci_init_library()
1067 1067
 	 *
1068
-	 * @param	string	$library	Library name to load
1068
+	 * @param	string	$library_name	Library name to load
1069 1069
 	 * @param	string	$file_path	Path to the library filename, relative to libraries/
1070 1070
 	 * @param	mixed	$params		Optional parameters to pass to the class constructor
1071 1071
 	 * @param	string	$object_name	Optional object name to assign to
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.3-Loader.php 3 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -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
 			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
342 342
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
343 343
 	{
344 344
 		// Grab the super object
345
-		$CI =& get_instance();
345
+		$CI = & get_instance();
346 346
 
347 347
 		// Do we even need to load the database class?
348 348
 		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
362 362
 		$CI->db = '';
363 363
 
364 364
 		// Load the DB class
365
-		$CI->db =& DB($params, $query_builder);
365
+		$CI->db = & DB($params, $query_builder);
366 366
 		return $this;
367 367
 	}
368 368
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function dbutil($db = NULL, $return = FALSE)
379 379
 	{
380
-		$CI =& get_instance();
380
+		$CI = & get_instance();
381 381
 
382 382
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
383 383
 		{
384 384
 			class_exists('CI_DB', FALSE) OR $this->database();
385
-			$db =& $CI->db;
385
+			$db = & $CI->db;
386 386
 		}
387 387
 
388 388
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function dbforge($db = NULL, $return = FALSE)
411 411
 	{
412
-		$CI =& get_instance();
412
+		$CI = & get_instance();
413 413
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
414 414
 		{
415 415
 			class_exists('CI_DB', FALSE) OR $this->database();
416
-			$db =& $CI->db;
416
+			$db = & $CI->db;
417 417
 		}
418 418
 
419 419
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
747 747
 
748 748
 		// Add config file path
749
-		$config =& $this->_ci_get_component('config');
749
+		$config = & $this->_ci_get_component('config');
750 750
 		$config->_config_paths[] = $path;
751 751
 
752 752
 		return $this;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
784
-		$config =& $this->_ci_get_component('config');
784
+		$config = & $this->_ci_get_component('config');
785 785
 
786 786
 		if ($path === '')
787 787
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
882 882
 
883 883
 		// This allows anything loaded using $this->load (views, files, etc.)
884 884
 		// to become accessible from within the Controller and Model functions.
885
-		$_ci_CI =& get_instance();
885
+		$_ci_CI = & get_instance();
886 886
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
887 887
 		{
888 888
 			if ( ! isset($this->$_ci_key))
889 889
 			{
890
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
890
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
891 891
 			}
892 892
 		}
893 893
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 				// return a new instance of the object
1027 1027
 				if ($object_name !== NULL)
1028 1028
 				{
1029
-					$CI =& get_instance();
1029
+					$CI = & get_instance();
1030 1030
 					if ( ! isset($CI->$object_name))
1031 1031
 					{
1032 1032
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			// return a new instance of the object
1090 1090
 			if ($object_name !== NULL)
1091 1091
 			{
1092
-				$CI =& get_instance();
1092
+				$CI = & get_instance();
1093 1093
 				if ( ! isset($CI->$object_name))
1094 1094
 				{
1095 1095
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
 		}
1233 1233
 
1234 1234
 		// Don't overwrite existing properties
1235
-		$CI =& get_instance();
1235
+		$CI = & get_instance();
1236 1236
 		if (isset($CI->$object_name))
1237 1237
 		{
1238 1238
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 */
1366 1366
 	protected function &_ci_get_component($component)
1367 1367
 	{
1368
-		$CI =& get_instance();
1368
+		$CI = & get_instance();
1369 1369
 		return $CI->$component;
1370 1370
 	}
1371 1371
 
Please login to merge, or discard this patch.
Braces   +14 added lines, -28 removed lines patch added patch discarded remove patch
@@ -192,16 +192,14 @@  discard block
 block discarded – undo
192 192
 		if (empty($library))
193 193
 		{
194 194
 			return $this;
195
-		}
196
-		elseif (is_array($library))
195
+		} elseif (is_array($library))
197 196
 		{
198 197
 			foreach ($library as $key => $value)
199 198
 			{
200 199
 				if (is_int($key))
201 200
 				{
202 201
 					$this->library($value, $params);
203
-				}
204
-				else
202
+				} else
205 203
 				{
206 204
 					$this->library($key, $params, $value);
207 205
 				}
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
 		if (empty($model))
239 237
 		{
240 238
 			return $this;
241
-		}
242
-		elseif (is_array($model))
239
+		} elseif (is_array($model))
243 240
 		{
244 241
 			foreach ($model as $key => $value)
245 242
 			{
@@ -427,8 +424,7 @@  discard block
 block discarded – undo
427 424
 				require_once($driver_path);
428 425
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
429 426
 			}
430
-		}
431
-		else
427
+		} else
432 428
 		{
433 429
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
434 430
 		}
@@ -696,8 +692,7 @@  discard block
 block discarded – undo
696 692
 			}
697 693
 
698 694
 			return $this;
699
-		}
700
-		elseif (empty($library))
695
+		} elseif (empty($library))
701 696
 		{
702 697
 			return FALSE;
703 698
 		}
@@ -790,8 +785,7 @@  discard block
 block discarded – undo
790 785
 			array_shift($this->_ci_helper_paths);
791 786
 			array_shift($this->_ci_view_paths);
792 787
 			array_pop($config->_config_paths);
793
-		}
794
-		else
788
+		} else
795 789
 		{
796 790
 			$path = rtrim($path, '/').'/';
797 791
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -853,8 +847,7 @@  discard block
 block discarded – undo
853 847
 		{
854 848
 			$_ci_x = explode('/', $_ci_path);
855 849
 			$_ci_file = end($_ci_x);
856
-		}
857
-		else
850
+		} else
858 851
 		{
859 852
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
860 853
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -924,8 +917,7 @@  discard block
 block discarded – undo
924 917
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
925 918
 		{
926 919
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
927
-		}
928
-		else
920
+		} else
929 921
 		{
930 922
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
931 923
 		}
@@ -952,8 +944,7 @@  discard block
 block discarded – undo
952 944
 		if (ob_get_level() > $this->_ci_ob_level + 1)
953 945
 		{
954 946
 			ob_end_flush();
955
-		}
956
-		else
947
+		} else
957 948
 		{
958 949
 			$_ci_CI->output->append_output(ob_get_contents());
959 950
 			@ob_end_clean();
@@ -993,8 +984,7 @@  discard block
 block discarded – undo
993 984
 
994 985
 			// Get the filename from the path
995 986
 			$class = substr($class, $last_slash);
996
-		}
997
-		else
987
+		} else
998 988
 		{
999 989
 			$subdir = '';
1000 990
 		}
@@ -1135,8 +1125,7 @@  discard block
 block discarded – undo
1135 1125
 				{
1136 1126
 					$prefix = config_item('subclass_prefix');
1137 1127
 					break;
1138
-				}
1139
-				else
1128
+				} else
1140 1129
 				{
1141 1130
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
1142 1131
 				}
@@ -1183,8 +1172,7 @@  discard block
 block discarded – undo
1183 1172
 					{
1184 1173
 						include($path.'config/'.strtolower($class).'.php');
1185 1174
 						$found = TRUE;
1186
-					}
1187
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1175
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1188 1176
 					{
1189 1177
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1190 1178
 						$found = TRUE;
@@ -1194,8 +1182,7 @@  discard block
 block discarded – undo
1194 1182
 					{
1195 1183
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1196 1184
 						$found = TRUE;
1197
-					}
1198
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1185
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1199 1186
 					{
1200 1187
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1201 1188
 						$found = TRUE;
@@ -1386,8 +1373,7 @@  discard block
 block discarded – undo
1386 1373
 		if ( ! is_array($filename))
1387 1374
 		{
1388 1375
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
1389
-		}
1390
-		else
1376
+		} else
1391 1377
 		{
1392 1378
 			foreach ($filename as $key => $val)
1393 1379
 			{
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove 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
 	 */
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 	/**
332 332
 	 * Database Loader
333 333
 	 *
334
-	 * @param	mixed	$params		Database configuration options
334
+	 * @param	string|boolean	$params		Database configuration options
335 335
 	 * @param	bool	$return 	Whether to return the database object
336 336
 	 * @param	bool	$query_builder	Whether to enable Query Builder
337 337
 	 *					(overrides the configuration setting)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 	 *					An associative array or object containing values
488 488
 	 *					to be set, or a value's name if string
489 489
 	 * @param 	string	$val	Value to set, only used if $vars is a string
490
-	 * @return	object
490
+	 * @return	CI_Loader
491 491
 	 */
492 492
 	public function vars($vars, $val = '')
493 493
 	{
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 	 * Helper Loader
560 560
 	 *
561 561
 	 * @param	string|string[]	$helpers	Helper name(s)
562
-	 * @return	object
562
+	 * @return	CI_Loader
563 563
 	 */
564 564
 	public function helper($helpers = array())
565 565
 	{
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 	 *
631 631
 	 * @uses	CI_Loader::helper()
632 632
 	 * @param	string|string[]	$helpers	Helper name(s)
633
-	 * @return	object
633
+	 * @return	CI_Loader
634 634
 	 */
635 635
 	public function helpers($helpers = array())
636 636
 	{
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 	 *
647 647
 	 * @param	string|string[]	$files	List of language file names to load
648 648
 	 * @param	string		Language name
649
-	 * @return	object
649
+	 * @return	CI_Loader
650 650
 	 */
651 651
 	public function language($files, $lang = '')
652 652
 	{
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 	 *
734 734
 	 * @param	string	$path		Path to add
735 735
 	 * @param 	bool	$view_cascade	(default: TRUE)
736
-	 * @return	object
736
+	 * @return	CI_Loader
737 737
 	 */
738 738
 	public function add_package_path($path, $view_cascade = TRUE)
739 739
 	{
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 	 * added path will be removed removed.
778 778
 	 *
779 779
 	 * @param	string	$path	Path to remove
780
-	 * @return	object
780
+	 * @return	CI_Loader
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
1065 1065
 	 * @used-by	CI_Loader::_ci_load_library()
1066 1066
 	 * @uses	CI_Loader::_ci_init_library()
1067 1067
 	 *
1068
-	 * @param	string	$library	Library name to load
1068
+	 * @param	string	$library_name	Library name to load
1069 1069
 	 * @param	string	$file_path	Path to the library filename, relative to libraries/
1070 1070
 	 * @param	mixed	$params		Optional parameters to pass to the class constructor
1071 1071
 	 * @param	string	$object_name	Optional object name to assign to
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.5-CodeIgniter.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,16 +419,14 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
@@ -475,8 +468,7 @@  discard block
 block discarded – undo
475 468
 						$RTR->directory = '';
476 469
 					}
477 470
 				}
478
-			}
479
-			else
471
+			} else
480 472
 			{
481 473
 				$e404 = FALSE;
482 474
 			}
@@ -492,8 +484,7 @@  discard block
 block discarded – undo
492 484
 				1 => $class,
493 485
 				2 => $method
494 486
 			);
495
-		}
496
-		else
487
+		} else
497 488
 		{
498 489
 			show_404($RTR->directory.$class.'/'.$method);
499 490
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.0.4-Loader.php 3 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -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
 			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
342 342
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
343 343
 	{
344 344
 		// Grab the super object
345
-		$CI =& get_instance();
345
+		$CI = & get_instance();
346 346
 
347 347
 		// Do we even need to load the database class?
348 348
 		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
362 362
 		$CI->db = '';
363 363
 
364 364
 		// Load the DB class
365
-		$CI->db =& DB($params, $query_builder);
365
+		$CI->db = & DB($params, $query_builder);
366 366
 		return $this;
367 367
 	}
368 368
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function dbutil($db = NULL, $return = FALSE)
379 379
 	{
380
-		$CI =& get_instance();
380
+		$CI = & get_instance();
381 381
 
382 382
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
383 383
 		{
384 384
 			class_exists('CI_DB', FALSE) OR $this->database();
385
-			$db =& $CI->db;
385
+			$db = & $CI->db;
386 386
 		}
387 387
 
388 388
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function dbforge($db = NULL, $return = FALSE)
411 411
 	{
412
-		$CI =& get_instance();
412
+		$CI = & get_instance();
413 413
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
414 414
 		{
415 415
 			class_exists('CI_DB', FALSE) OR $this->database();
416
-			$db =& $CI->db;
416
+			$db = & $CI->db;
417 417
 		}
418 418
 
419 419
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
747 747
 
748 748
 		// Add config file path
749
-		$config =& $this->_ci_get_component('config');
749
+		$config = & $this->_ci_get_component('config');
750 750
 		$config->_config_paths[] = $path;
751 751
 
752 752
 		return $this;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
784
-		$config =& $this->_ci_get_component('config');
784
+		$config = & $this->_ci_get_component('config');
785 785
 
786 786
 		if ($path === '')
787 787
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
882 882
 
883 883
 		// This allows anything loaded using $this->load (views, files, etc.)
884 884
 		// to become accessible from within the Controller and Model functions.
885
-		$_ci_CI =& get_instance();
885
+		$_ci_CI = & get_instance();
886 886
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
887 887
 		{
888 888
 			if ( ! isset($this->$_ci_key))
889 889
 			{
890
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
890
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
891 891
 			}
892 892
 		}
893 893
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 				// return a new instance of the object
1027 1027
 				if ($object_name !== NULL)
1028 1028
 				{
1029
-					$CI =& get_instance();
1029
+					$CI = & get_instance();
1030 1030
 					if ( ! isset($CI->$object_name))
1031 1031
 					{
1032 1032
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			// return a new instance of the object
1090 1090
 			if ($object_name !== NULL)
1091 1091
 			{
1092
-				$CI =& get_instance();
1092
+				$CI = & get_instance();
1093 1093
 				if ( ! isset($CI->$object_name))
1094 1094
 				{
1095 1095
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
 		}
1233 1233
 
1234 1234
 		// Don't overwrite existing properties
1235
-		$CI =& get_instance();
1235
+		$CI = & get_instance();
1236 1236
 		if (isset($CI->$object_name))
1237 1237
 		{
1238 1238
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 */
1366 1366
 	protected function &_ci_get_component($component)
1367 1367
 	{
1368
-		$CI =& get_instance();
1368
+		$CI = & get_instance();
1369 1369
 		return $CI->$component;
1370 1370
 	}
1371 1371
 
Please login to merge, or discard this patch.
Braces   +15 added lines, -30 removed lines patch added patch discarded remove patch
@@ -192,16 +192,14 @@  discard block
 block discarded – undo
192 192
 		if (empty($library))
193 193
 		{
194 194
 			return $this;
195
-		}
196
-		elseif (is_array($library))
195
+		} elseif (is_array($library))
197 196
 		{
198 197
 			foreach ($library as $key => $value)
199 198
 			{
200 199
 				if (is_int($key))
201 200
 				{
202 201
 					$this->library($value, $params);
203
-				}
204
-				else
202
+				} else
205 203
 				{
206 204
 					$this->library($key, $params, $value);
207 205
 				}
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
 		if (empty($model))
239 237
 		{
240 238
 			return $this;
241
-		}
242
-		elseif (is_array($model))
239
+		} elseif (is_array($model))
243 240
 		{
244 241
 			foreach ($model as $key => $value)
245 242
 			{
@@ -305,8 +302,7 @@  discard block
 block discarded – undo
305 302
 				{
306 303
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
307 304
 				}
308
-			}
309
-			elseif ( ! class_exists('CI_Model', FALSE))
305
+			} elseif ( ! class_exists('CI_Model', FALSE))
310 306
 			{
311 307
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
312 308
 			}
@@ -457,8 +453,7 @@  discard block
 block discarded – undo
457 453
 				require_once($driver_path);
458 454
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
459 455
 			}
460
-		}
461
-		else
456
+		} else
462 457
 		{
463 458
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
464 459
 		}
@@ -726,8 +721,7 @@  discard block
 block discarded – undo
726 721
 			}
727 722
 
728 723
 			return $this;
729
-		}
730
-		elseif (empty($library))
724
+		} elseif (empty($library))
731 725
 		{
732 726
 			return FALSE;
733 727
 		}
@@ -820,8 +814,7 @@  discard block
 block discarded – undo
820 814
 			array_shift($this->_ci_helper_paths);
821 815
 			array_shift($this->_ci_view_paths);
822 816
 			array_pop($config->_config_paths);
823
-		}
824
-		else
817
+		} else
825 818
 		{
826 819
 			$path = rtrim($path, '/').'/';
827 820
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -883,8 +876,7 @@  discard block
 block discarded – undo
883 876
 		{
884 877
 			$_ci_x = explode('/', $_ci_path);
885 878
 			$_ci_file = end($_ci_x);
886
-		}
887
-		else
879
+		} else
888 880
 		{
889 881
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
890 882
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -954,8 +946,7 @@  discard block
 block discarded – undo
954 946
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
955 947
 		{
956 948
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
957
-		}
958
-		else
949
+		} else
959 950
 		{
960 951
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
961 952
 		}
@@ -982,8 +973,7 @@  discard block
 block discarded – undo
982 973
 		if (ob_get_level() > $this->_ci_ob_level + 1)
983 974
 		{
984 975
 			ob_end_flush();
985
-		}
986
-		else
976
+		} else
987 977
 		{
988 978
 			$_ci_CI->output->append_output(ob_get_contents());
989 979
 			@ob_end_clean();
@@ -1023,8 +1013,7 @@  discard block
 block discarded – undo
1023 1013
 
1024 1014
 			// Get the filename from the path
1025 1015
 			$class = substr($class, $last_slash);
1026
-		}
1027
-		else
1016
+		} else
1028 1017
 		{
1029 1018
 			$subdir = '';
1030 1019
 		}
@@ -1165,8 +1154,7 @@  discard block
 block discarded – undo
1165 1154
 				{
1166 1155
 					$prefix = config_item('subclass_prefix');
1167 1156
 					break;
1168
-				}
1169
-				else
1157
+				} else
1170 1158
 				{
1171 1159
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
1172 1160
 				}
@@ -1213,8 +1201,7 @@  discard block
 block discarded – undo
1213 1201
 					{
1214 1202
 						include($path.'config/'.strtolower($class).'.php');
1215 1203
 						$found = TRUE;
1216
-					}
1217
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1204
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1218 1205
 					{
1219 1206
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1220 1207
 						$found = TRUE;
@@ -1224,8 +1211,7 @@  discard block
 block discarded – undo
1224 1211
 					{
1225 1212
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1226 1213
 						$found = TRUE;
1227
-					}
1228
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1214
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1229 1215
 					{
1230 1216
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1231 1217
 						$found = TRUE;
@@ -1416,8 +1402,7 @@  discard block
 block discarded – undo
1416 1402
 		if ( ! is_array($filename))
1417 1403
 		{
1418 1404
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
1419
-		}
1420
-		else
1405
+		} else
1421 1406
 		{
1422 1407
 			foreach ($filename as $key => $val)
1423 1408
 			{
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove 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
 	 */
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 	/**
332 332
 	 * Database Loader
333 333
 	 *
334
-	 * @param	mixed	$params		Database configuration options
334
+	 * @param	string|boolean	$params		Database configuration options
335 335
 	 * @param	bool	$return 	Whether to return the database object
336 336
 	 * @param	bool	$query_builder	Whether to enable Query Builder
337 337
 	 *					(overrides the configuration setting)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 	 *					An associative array or object containing values
488 488
 	 *					to be set, or a value's name if string
489 489
 	 * @param 	string	$val	Value to set, only used if $vars is a string
490
-	 * @return	object
490
+	 * @return	CI_Loader
491 491
 	 */
492 492
 	public function vars($vars, $val = '')
493 493
 	{
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 	 * Helper Loader
560 560
 	 *
561 561
 	 * @param	string|string[]	$helpers	Helper name(s)
562
-	 * @return	object
562
+	 * @return	CI_Loader
563 563
 	 */
564 564
 	public function helper($helpers = array())
565 565
 	{
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 	 *
631 631
 	 * @uses	CI_Loader::helper()
632 632
 	 * @param	string|string[]	$helpers	Helper name(s)
633
-	 * @return	object
633
+	 * @return	CI_Loader
634 634
 	 */
635 635
 	public function helpers($helpers = array())
636 636
 	{
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 	 *
647 647
 	 * @param	string|string[]	$files	List of language file names to load
648 648
 	 * @param	string		Language name
649
-	 * @return	object
649
+	 * @return	CI_Loader
650 650
 	 */
651 651
 	public function language($files, $lang = '')
652 652
 	{
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 	 *
734 734
 	 * @param	string	$path		Path to add
735 735
 	 * @param 	bool	$view_cascade	(default: TRUE)
736
-	 * @return	object
736
+	 * @return	CI_Loader
737 737
 	 */
738 738
 	public function add_package_path($path, $view_cascade = TRUE)
739 739
 	{
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 	 * added path will be removed removed.
778 778
 	 *
779 779
 	 * @param	string	$path	Path to remove
780
-	 * @return	object
780
+	 * @return	CI_Loader
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
1065 1065
 	 * @used-by	CI_Loader::_ci_load_library()
1066 1066
 	 * @uses	CI_Loader::_ci_init_library()
1067 1067
 	 *
1068
-	 * @param	string	$library	Library name to load
1068
+	 * @param	string	$library_name	Library name to load
1069 1069
 	 * @param	string	$file_path	Path to the library filename, relative to libraries/
1070 1070
 	 * @param	mixed	$params		Optional parameters to pass to the class constructor
1071 1071
 	 * @param	string	$object_name	Optional object name to assign to
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/3.1.0-CodeIgniter.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,16 +419,14 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
@@ -475,8 +468,7 @@  discard block
 block discarded – undo
475 468
 						$RTR->directory = '';
476 469
 					}
477 470
 				}
478
-			}
479
-			else
471
+			} else
480 472
 			{
481 473
 				$e404 = FALSE;
482 474
 			}
@@ -492,8 +484,7 @@  discard block
 block discarded – undo
492 484
 				1 => $class,
493 485
 				2 => $method
494 486
 			);
495
-		}
496
-		else
487
+		} else
497 488
 		{
498 489
 			show_404($RTR->directory.$class.'/'.$method);
499 490
 		}
Please login to merge, or discard this patch.