Completed
Pull Request — master (#364)
by Kenji
02:19
created
application/tests/_ci_phpunit_test/replacing/core/old/3.1.2-CodeIgniter.php 1 patch
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.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.3-Input.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -137,17 +137,17 @@  discard block
 block discarded – undo
137 137
 	 */
138 138
 	public function __construct()
139 139
 	{
140
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
141
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
142
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
143
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
140
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
141
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
142
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
143
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
144 144
 
145
-		$this->security =& load_class('Security', 'core');
145
+		$this->security = & load_class('Security', 'core');
146 146
 
147 147
 		// Do we need the UTF-8 class?
148 148
 		if (UTF8_ENABLED === TRUE)
149 149
 		{
150
-			$this->uni =& load_class('Utf8', 'core');
150
+			$this->uni = & load_class('Utf8', 'core');
151 151
 		}
152 152
 
153 153
 		// Sanitize global arrays
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 		// Save cookie in Output object
415 415
 		// added by ci-phpunit-test
416
-		$CI =& get_instance();
416
+		$CI = & get_instance();
417 417
 		$output = $CI->output;
418 418
 		$output->_cookies[$prefix.$name][] = [
419 419
 			'value' => $value,
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.0-Common.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 
264 264
 	// Save status code in Output object
265 265
 	// added by ci-phpunit-test
266
-	$CI =& get_instance();
266
+	$CI = & get_instance();
267 267
 	$output = $CI->output;
268 268
 	$output->_status = [
269 269
 		'code'     => $code,
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 	if (empty($_config))
377 377
 	{
378 378
 		// references cannot be directly assigned to static variables, so we use an array
379
-		$_config[0] =& get_config();
379
+		$_config[0] = & get_config();
380 380
 	}
381 381
 
382 382
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.4-Input.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -137,17 +137,17 @@  discard block
 block discarded – undo
137 137
 	 */
138 138
 	public function __construct()
139 139
 	{
140
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
141
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
142
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
143
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
140
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
141
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
142
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
143
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
144 144
 
145
-		$this->security =& load_class('Security', 'core');
145
+		$this->security = & load_class('Security', 'core');
146 146
 
147 147
 		// Do we need the UTF-8 class?
148 148
 		if (UTF8_ENABLED === TRUE)
149 149
 		{
150
-			$this->uni =& load_class('Utf8', 'core');
150
+			$this->uni = & load_class('Utf8', 'core');
151 151
 		}
152 152
 
153 153
 		// Sanitize global arrays
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 		// Save cookie in Output object
415 415
 		// added by ci-phpunit-test
416
-		$CI =& get_instance();
416
+		$CI = & get_instance();
417 417
 		$output = $CI->output;
418 418
 		$output->_cookies[$prefix.$name][] = [
419 419
 			'value' => $value,
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.5-Loader.php 1 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.
application/tests/_ci_phpunit_test/replacing/core/old/3.1.2-Common.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 
264 264
 	// Save status code in Output object
265 265
 	// added by ci-phpunit-test
266
-	$CI =& get_instance();
266
+	$CI = & get_instance();
267 267
 	$output = $CI->output;
268 268
 	$output->_status = [
269 269
 		'code'     => $code,
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 	if (empty($_config))
377 377
 	{
378 378
 		// references cannot be directly assigned to static variables, so we use an array
379
-		$_config[0] =& get_config();
379
+		$_config[0] = & get_config();
380 380
 	}
381 381
 
382 382
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.1.2-Loader.php 1 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.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.3-Loader.php 1 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.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.5-CodeIgniter.php 1 patch
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.