Completed
Pull Request — master (#290)
by Kenji
04:19
created
tests/_ci_phpunit_test/replacing/helpers/old/3.1.6-url_helper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 				ob_end_clean();
106 106
 			}
107 107
 
108
-			throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code);
108
+			throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code);
109 109
 		}
110 110
 	}
111 111
 }
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Input.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -139,17 +139,17 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	public function __construct()
141 141
 	{
142
-		$this->_allow_get_array		= (config_item('allow_get_array') !== FALSE);
143
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
144
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
145
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
142
+		$this->_allow_get_array = (config_item('allow_get_array') !== FALSE);
143
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
144
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
145
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
146 146
 
147
-		$this->security =& load_class('Security', 'core');
147
+		$this->security = & load_class('Security', 'core');
148 148
 
149 149
 		// Do we need the UTF-8 class?
150 150
 		if (UTF8_ENABLED === TRUE)
151 151
 		{
152
-			$this->uni =& load_class('Utf8', 'core');
152
+			$this->uni = & load_class('Utf8', 'core');
153 153
 		}
154 154
 
155 155
 		// Sanitize global arrays
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 
430 430
 		// Save cookie in Output object
431 431
 		// added by ci-phpunit-test
432
-		$CI =& get_instance();
432
+		$CI = & get_instance();
433 433
 		$output = $CI->output;
434 434
 		$output->_cookies[$prefix.$name][] = [
435 435
 			'value' => $value,
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.1.6-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.1.6-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.6-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.1.6-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
 	);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	public function __construct()
139 139
 	{
140 140
 		$this->_ci_ob_level = ob_get_level();
141
-		$this->_ci_classes =& is_loaded();
141
+		$this->_ci_classes = & is_loaded();
142 142
 
143 143
 		log_message('info', 'Loader Class Initialized');
144 144
 	}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			return $this;
280 280
 		}
281 281
 
282
-		$CI =& get_instance();
282
+		$CI = & get_instance();
283 283
 		if (isset($CI->$name))
284 284
 		{
285 285
 			throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
383 383
 	{
384 384
 		// Grab the super object
385
-		$CI =& get_instance();
385
+		$CI = & get_instance();
386 386
 
387 387
 		// Do we even need to load the database class?
388 388
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 		$CI->db = '';
403 403
 
404 404
 		// Load the DB class
405
-		$CI->db =& DB($params, $query_builder);
405
+		$CI->db = & DB($params, $query_builder);
406 406
 		return $this;
407 407
 	}
408 408
 
@@ -419,12 +419,12 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	public function dbutil($db = NULL, $return = FALSE)
421 421
 	{
422
-		$CI =& get_instance();
422
+		$CI = & get_instance();
423 423
 
424 424
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
425 425
 		{
426 426
 			class_exists('CI_DB', FALSE) OR $this->database();
427
-			$db =& $CI->db;
427
+			$db = & $CI->db;
428 428
 		}
429 429
 
430 430
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -453,11 +453,11 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public function dbforge($db = NULL, $return = FALSE)
455 455
 	{
456
-		$CI =& get_instance();
456
+		$CI = & get_instance();
457 457
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
458 458
 		{
459 459
 			class_exists('CI_DB', FALSE) OR $this->database();
460
-			$db =& $CI->db;
460
+			$db = & $CI->db;
461 461
 		}
462 462
 
463 463
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
820 820
 
821 821
 		// Add config file path
822
-		$config =& $this->_ci_get_component('config');
822
+		$config = & $this->_ci_get_component('config');
823 823
 		$config->_config_paths[] = $path;
824 824
 
825 825
 		return $this;
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
 	 */
859 859
 	public function remove_package_path($path = '')
860 860
 	{
861
-		$config =& $this->_ci_get_component('config');
861
+		$config = & $this->_ci_get_component('config');
862 862
 
863 863
 		if ($path === '')
864 864
 		{
@@ -961,12 +961,12 @@  discard block
 block discarded – undo
961 961
 
962 962
 		// This allows anything loaded using $this->load (views, files, etc.)
963 963
 		// to become accessible from within the Controller and Model functions.
964
-		$_ci_CI =& get_instance();
964
+		$_ci_CI = & get_instance();
965 965
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
966 966
 		{
967 967
 			if ( ! isset($this->$_ci_key))
968 968
 			{
969
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
969
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
970 970
 			}
971 971
 		}
972 972
 
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1100 1100
 			}
1101 1101
 
1102
-			$CI =& get_instance();
1102
+			$CI = & get_instance();
1103 1103
 			if (isset($CI->$property))
1104 1104
 			{
1105 1105
 //				log_message('debug', $class.' class already loaded. Second attempt ignored.');
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1175 1175
 			}
1176 1176
 
1177
-			$CI =& get_instance();
1177
+			$CI = & get_instance();
1178 1178
 			if ( ! isset($CI->$property))
1179 1179
 			{
1180 1180
 				return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1322,7 +1322,7 @@  discard block
 block discarded – undo
1322 1322
 		}
1323 1323
 
1324 1324
 		// Don't overwrite existing properties
1325
-		$CI =& get_instance();
1325
+		$CI = & get_instance();
1326 1326
 		if (isset($CI->$object_name))
1327 1327
 		{
1328 1328
 			if ($CI->$object_name instanceof $class_name)
@@ -1473,7 +1473,7 @@  discard block
 block discarded – undo
1473 1473
 	 */
1474 1474
 	protected function &_ci_get_component($component)
1475 1475
 	{
1476
-		$CI =& get_instance();
1476
+		$CI = & get_instance();
1477 1477
 		return $CI->$component;
1478 1478
 	}
1479 1479
 }
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Output.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @var	array
78 78
 	 */
79
-	public $mimes =	array();
79
+	public $mimes = array();
80 80
 
81 81
 	/**
82 82
 	 * Mime-type for the current page
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 *
112 112
 	 * @var	array
113 113
 	 */
114
-	protected $_profiler_sections =	array();
114
+	protected $_profiler_sections = array();
115 115
 
116 116
 	/**
117 117
 	 * Parse markers flag
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
167 167
 
168 168
 		// Get mime types for later
169
-		$this->mimes =& get_mimes();
169
+		$this->mimes = & get_mimes();
170 170
 
171 171
 		log_message('info', 'Output Class Initialized');
172 172
 	}
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 			// Is this extension supported?
265 265
 			if (isset($this->mimes[$extension]))
266 266
 			{
267
-				$mime_type =& $this->mimes[$extension];
267
+				$mime_type = & $this->mimes[$extension];
268 268
 
269 269
 				if (is_array($mime_type))
270 270
 				{
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 		{
335 335
 			if (strncasecmp($header, $headers[$c], $l = self::strlen($header)) === 0)
336 336
 			{
337
-				return trim(self::substr($headers[$c], $l+1));
337
+				return trim(self::substr($headers[$c], $l + 1));
338 338
 			}
339 339
 		}
340 340
 
@@ -437,13 +437,13 @@  discard block
 block discarded – undo
437 437
 		// Note:  We use load_class() because we can't use $CI =& get_instance()
438 438
 		// since this function is sometimes called by the caching mechanism,
439 439
 		// which happens before the CI super object is available.
440
-		$BM =& load_class('Benchmark', 'core');
441
-		$CFG =& load_class('Config', 'core');
440
+		$BM = & load_class('Benchmark', 'core');
441
+		$CFG = & load_class('Config', 'core');
442 442
 
443 443
 		// Grab the super object if we can.
444 444
 		if (class_exists('CI_Controller', FALSE))
445 445
 		{
446
-			$CI =& get_instance();
446
+			$CI = & get_instance();
447 447
 		}
448 448
 
449 449
 		// --------------------------------------------------------------------
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 		// Set the output data
452 452
 		if ($output === '')
453 453
 		{
454
-			$output =& $this->final_output;
454
+			$output = & $this->final_output;
455 455
 		}
456 456
 
457 457
 		// --------------------------------------------------------------------
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 	 */
573 573
 	public function _write_cache($output)
574 574
 	{
575
-		$CI =& get_instance();
575
+		$CI = & get_instance();
576 576
 		$path = $CI->config->item('cache_path');
577 577
 		$cache_path = ($path === '') ? APPPATH.'cache/' : $path;
578 578
 
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
 	 */
752 752
 	public function delete_cache($uri = '')
753 753
 	{
754
-		$CI =& get_instance();
754
+		$CI = & get_instance();
755 755
 		$cache_path = $CI->config->item('cache_path');
756 756
 		if ($cache_path === '')
757 757
 		{
Please login to merge, or discard this patch.
application/libraries/Seeder.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function __construct()
20 20
 	{
21
-		$this->CI =& get_instance();
21
+		$this->CI = & get_instance();
22 22
 		$this->CI->load->database();
23 23
 		$this->CI->load->dbforge();
24 24
 		$this->db = $this->CI->db;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	{
35 35
 		if ($this->seedPath === null)
36 36
 		{
37
-			$this->seedPath = APPPATH . 'database/seeds/';
37
+			$this->seedPath = APPPATH.'database/seeds/';
38 38
 		}
39 39
 
40 40
 		$obj = $this->loadSeeder($seeder);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	protected function loadSeeder($seeder)
55 55
 	{
56
-		$file = $this->seedPath . $seeder . '.php';
56
+		$file = $this->seedPath.$seeder.'.php';
57 57
 		require_once $file;
58 58
 
59 59
 		return new $seeder;
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/replacing/helpers/old/3.1.7-url_helper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 				ob_end_clean();
106 106
 			}
107 107
 
108
-			throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code);
108
+			throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code);
109 109
 		}
110 110
 	}
111 111
 }
Please login to merge, or discard this patch.