Completed
Push — master ( 58fe32...761b56 )
by Kenji
9s
created
application/tests/_ci_phpunit_test/replacing/core/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/Bootstrap.php 3 patches
Switch Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -69,28 +69,28 @@
 block discarded – undo
69 69
  */
70 70
 switch (ENVIRONMENT)
71 71
 {
72
-	case 'testing':
73
-	case 'development':
74
-		error_reporting(-1);
75
-		ini_set('display_errors', 1);
76
-	break;
72
+		case 'testing':
73
+		case 'development':
74
+			error_reporting(-1);
75
+			ini_set('display_errors', 1);
76
+		break;
77 77
 
78
-	case 'production':
79
-		ini_set('display_errors', 0);
80
-		if (version_compare(PHP_VERSION, '5.3', '>='))
81
-		{
82
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
83
-		}
84
-		else
85
-		{
86
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
87
-		}
88
-	break;
78
+		case 'production':
79
+			ini_set('display_errors', 0);
80
+			if (version_compare(PHP_VERSION, '5.3', '>='))
81
+			{
82
+				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
83
+			}
84
+			else
85
+			{
86
+				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
87
+			}
88
+		break;
89 89
 
90
-	default:
91
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
92
-		echo 'The application environment is not set correctly.';
93
-		exit(1); // EXIT_ERROR
90
+		default:
91
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
92
+			echo 'The application environment is not set correctly.';
93
+			exit(1); // EXIT_ERROR
94 94
 }
95 95
 
96 96
 /*
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -80,8 +80,7 @@  discard block
 block discarded – undo
80 80
 		if (version_compare(PHP_VERSION, '5.3', '>='))
81 81
 		{
82 82
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
83
-		}
84
-		else
83
+		} else
85 84
 		{
86 85
 			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
87 86
 		}
@@ -204,8 +203,7 @@  discard block
 block discarded – undo
204 203
 	if (($_temp = realpath($system_path)) !== FALSE)
205 204
 	{
206 205
 		$system_path = $_temp.DIRECTORY_SEPARATOR;
207
-	}
208
-	else
206
+	} else
209 207
 	{
210 208
 		// Ensure there's a trailing slash
211 209
 		$system_path = strtr(
@@ -247,8 +245,7 @@  discard block
 block discarded – undo
247 245
 		if (($_temp = realpath($application_folder)) !== FALSE)
248 246
 		{
249 247
 			$application_folder = $_temp;
250
-		}
251
-		else
248
+		} else
252 249
 		{
253 250
 			$application_folder = strtr(
254 251
 				rtrim($application_folder, '/\\'),
@@ -256,16 +253,14 @@  discard block
 block discarded – undo
256 253
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
257 254
 			);
258 255
 		}
259
-	}
260
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
256
+	} elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
261 257
 	{
262 258
 		$application_folder = BASEPATH.strtr(
263 259
 			trim($application_folder, '/\\'),
264 260
 			'/\\',
265 261
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
266 262
 		);
267
-	}
268
-	else
263
+	} else
269 264
 	{
270 265
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
271 266
 		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
@@ -278,14 +273,12 @@  discard block
 block discarded – undo
278 273
 	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
279 274
 	{
280 275
 		$view_folder = APPPATH.'views';
281
-	}
282
-	elseif (is_dir($view_folder))
276
+	} elseif (is_dir($view_folder))
283 277
 	{
284 278
 		if (($_temp = realpath($view_folder)) !== FALSE)
285 279
 		{
286 280
 			$view_folder = $_temp;
287
-		}
288
-		else
281
+		} else
289 282
 		{
290 283
 			$view_folder = strtr(
291 284
 				rtrim($view_folder, '/\\'),
@@ -293,16 +286,14 @@  discard block
 block discarded – undo
293 286
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
294 287
 			);
295 288
 		}
296
-	}
297
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
289
+	} elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
298 290
 	{
299 291
 		$view_folder = APPPATH.strtr(
300 292
 			trim($view_folder, '/\\'),
301 293
 			'/\\',
302 294
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
303 295
 		);
304
-	}
305
-	else
296
+	} else
306 297
 	{
307 298
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
308 299
 		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
  * NOTE: If you change these, also change the error_reporting() code below
55 55
  */
56 56
 // This is needed for @runInSeparateProcess
57
-if (! defined('ENVIRONMENT'))
57
+if ( ! defined('ENVIRONMENT'))
58 58
 {
59 59
 	define('ENVIRONMENT', 'testing');
60 60
 }
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
  *  Added for ci-phpunit-test
358 358
  * -------------------------------------------------------------------
359 359
  */
360
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
360
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
361 361
 CIPHPUnitTest::init();
362 362
 /*
363 363
  * Or you can set directories for autoloading
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/PathChecker.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@
 block discarded – undo
38 38
 			$real_path = realpath($path);
39 39
 			if ($real_path === FALSE)
40 40
 			{
41
-				throw new RuntimeException($path . ' does not exist?');
41
+				throw new RuntimeException($path.' does not exist?');
42 42
 			}
43 43
 			if (is_dir($real_path))
44 44
 			{
45 45
 				// Must use DIRECTORY_SEPARATOR for Windows
46
-				$real_path = $real_path . DIRECTORY_SEPARATOR;
46
+				$real_path = $real_path.DIRECTORY_SEPARATOR;
47 47
 			}
48 48
 			$new_paths[] = $excluded ? '-'.$real_path : $real_path;
49 49
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestDbTestCase.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	{
36 36
 		if ($this->db === null)
37 37
 		{
38
-			$CI =& get_instance();
38
+			$CI = & get_instance();
39 39
 			$CI->load->database();
40 40
 			$this->db = $CI->db;
41 41
 		}
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	protected function tearDown()
56 56
 	{
57
-		if (! empty($this->insertCache))
57
+		if ( ! empty($this->insertCache))
58 58
 		{
59 59
 			foreach ($this->insertCache as $row)
60 60
 			{
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
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct()
19 19
 	{
20
-		$this->CI =& get_instance();
20
+		$this->CI = & get_instance();
21 21
 		$this->CI->load->database();
22 22
 		$this->CI->load->dbforge();
23 23
 		$this->db = $this->CI->db;
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 	{
34 34
 		if ($this->seedPath === null)
35 35
 		{
36
-			$this->seedPath = APPPATH . 'database/seeds/';
36
+			$this->seedPath = APPPATH.'database/seeds/';
37 37
 		}
38 38
 
39
-		$file = $this->seedPath . $seeder . '.php';
39
+		$file = $this->seedPath.$seeder.'.php';
40 40
 		require_once $file;
41 41
 
42 42
 		$obj = new $seeder;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/helpers/download_helper.php 2 patches
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@  discard block
 block discarded – undo
67 67
 		if ($filename === '' OR $data === '')
68 68
 		{
69 69
 			return;
70
-		}
71
-		elseif ($data === NULL)
70
+		} elseif ($data === NULL)
72 71
 		{
73 72
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
74 73
 			{
@@ -78,8 +77,7 @@  discard block
 block discarded – undo
78 77
 			$filepath = $filename;
79 78
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
80 79
 			$filename = end($filename);
81
-		}
82
-		else
80
+		} else
83 81
 		{
84 82
 			$filesize = strlen($data);
85 83
 		}
@@ -158,8 +156,7 @@  discard block
 block discarded – undo
158 156
 			if (ENVIRONMENT !== 'testing')
159 157
 			{
160 158
 				exit($data);
161
-			}
162
-			else
159
+			} else
163 160
 			{
164 161
 				echo($data);
165 162
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -176,8 +173,7 @@  discard block
 block discarded – undo
176 173
 		if (ENVIRONMENT !== 'testing')
177 174
 		{
178 175
 			exit;
179
-		}
180
-		else
176
+		} else
181 177
 		{
182 178
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
183 179
 		}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 			}
102 102
 
103 103
 			// Load the mime types
104
-			$mimes =& get_mimes();
104
+			$mimes = & get_mimes();
105 105
 
106 106
 			// Only change the default MIME if we can find one
107 107
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		if (ENVIRONMENT === 'testing')
148 148
 		{
149
-			$CI =& get_instance();
149
+			$CI = & get_instance();
150 150
 			$CI->output->set_header('Content-Type: '.$mime);
151 151
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
152 152
 			$CI->output->set_header('Expires: 0');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Handle single file
45
-		$file =& $files[$field];
45
+		$file = & $files[$field];
46 46
 
47
-		if (! file_exists($file['tmp_name']))
47
+		if ( ! file_exists($file['tmp_name']))
48 48
 		{
49 49
 			$file['error'] = UPLOAD_ERR_NO_FILE;
50 50
 			$file['type'] = '';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 				// Set $_GET if URI string has query string
111 111
 				parse_str($query_string, $_GET);
112 112
 				// Remove query string from URI string
113
-				$argv = substr($argv, 0, -strlen($query_string)-1);
113
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
114 114
 			}
115 115
 		}
116 116
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 		if ($_GET !== [])
144 144
 		{
145 145
 			$_SERVER['REQUEST_URI'] =
146
-				'/' . $path . '?'
146
+				'/'.$path.'?'
147 147
 				. http_build_query($_GET);
148 148
 		}
149 149
 		else
150 150
 		{
151
-			$_SERVER['REQUEST_URI'] = '/' . $path;
151
+			$_SERVER['REQUEST_URI'] = '/'.$path;
152 152
 		}
153 153
 	}
154 154
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		if ($query_string === false)
167 167
 		{
168
-			throw new LogicException('Bad URI string: ' . $uri);
168
+			throw new LogicException('Bad URI string: '.$uri);
169 169
 		}
170 170
 
171 171
 		return $query_string;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 		else
192 192
 		{
193
-			$key = 'HTTP_' . $normalized_name;
193
+			$key = 'HTTP_'.$normalized_name;
194 194
 		}
195 195
 
196 196
 		$_SERVER[$key] = $value;
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
 		if (is_numeric($value))
77 77
 		{
78 78
 			return $value;
79
-		}
80
-		else
79
+		} else
81 80
 		{
82 81
 			$value_length = strlen($value);
83 82
 			$number = substr($value, 0, $value_length - 1);
@@ -133,8 +132,7 @@  discard block
 block discarded – undo
133 132
 		if (is_string($argv))
134 133
 		{
135 134
 			$path = $argv;
136
-		}
137
-		elseif (is_array($argv))
135
+		} elseif (is_array($argv))
138 136
 		{
139 137
 			// Generate URI path from array of controller, method, arg, ...
140 138
 			$path = implode('/', $argv);
@@ -145,8 +143,7 @@  discard block
 block discarded – undo
145 143
 			$_SERVER['REQUEST_URI'] =
146 144
 				'/' . $path . '?'
147 145
 				. http_build_query($_GET);
148
-		}
149
-		else
146
+		} else
150 147
 		{
151 148
 			$_SERVER['REQUEST_URI'] = '/' . $path;
152 149
 		}
@@ -187,8 +184,7 @@  discard block
 block discarded – undo
187 184
 		)
188 185
 		{
189 186
 			$key = $normalized_name;
190
-		}
191
-		else
187
+		} else
192 188
 		{
193 189
 			$key = 'HTTP_' . $normalized_name;
194 190
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/Upload.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -293,8 +293,8 @@  discard block
 block discarded – undo
293 293
 	{
294 294
 		empty($config) OR $this->initialize($config, FALSE);
295 295
 
296
-		$this->_mimes =& get_mimes();
297
-		$this->_CI =& get_instance();
296
+		$this->_mimes = & get_mimes();
297
+		$this->_CI = & get_instance();
298 298
 
299 299
 		log_message('info', 'Upload Class Initialized');
300 300
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 			else
481 481
 			{
482 482
 				// An extension was provided, let's have it!
483
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
483
+				$this->file_ext = $this->get_extension($this->_file_name_override);
484 484
 			}
485 485
 
486 486
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 		// Convert the file size to kilobytes
494 494
 		if ($this->file_size > 0)
495 495
 		{
496
-			$this->file_size = round($this->file_size/1024, 2);
496
+			$this->file_size = round($this->file_size / 1024, 2);
497 497
 		}
498 498
 
499 499
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@  discard block
 block discarded – undo
818 818
 			{
819 819
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
820 820
 
821
-				$this->image_width	= $D[0];
822
-				$this->image_height	= $D[1];
823
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
-				$this->image_size_str	= $D[3]; // string containing height and width
821
+				$this->image_width = $D[0];
822
+				$this->image_height = $D[1];
823
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
+				$this->image_size_str = $D[3]; // string containing height and width
825 825
 			}
826 826
 		}
827 827
 
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 			$this->file_type = 'image/jpeg';
870 870
 		}
871 871
 
872
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
872
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
873 873
 
874 874
 		return in_array($this->file_type, $img_mimes, TRUE);
875 875
 	}
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 			return FALSE;
1012 1012
 		}
1013 1013
 
1014
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
1014
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
1015 1015
 		return TRUE;
1016 1016
 	}
1017 1017
 
@@ -1055,9 +1055,9 @@  discard block
 block discarded – undo
1055 1055
 		$ext = '';
1056 1056
 		if (strpos($filename, '.') !== FALSE)
1057 1057
 		{
1058
-			$parts		= explode('.', $filename);
1059
-			$ext		= '.'.array_pop($parts);
1060
-			$filename	= implode('.', $parts);
1058
+			$parts = explode('.', $filename);
1059
+			$ext = '.'.array_pop($parts);
1060
+			$filename = implode('.', $parts);
1061 1061
 		}
1062 1062
 
1063 1063
 		return substr($filename, 0, ($length - strlen($ext))).$ext;
Please login to merge, or discard this patch.
Braces   +21 added lines, -19 removed lines patch added patch discarded remove patch
@@ -331,19 +331,16 @@  discard block
 block discarded – undo
331 331
 					if ($reflection->hasMethod('set_'.$key))
332 332
 					{
333 333
 						$this->{'set_'.$key}($config[$key]);
334
-					}
335
-					else
334
+					} else
336 335
 					{
337 336
 						$this->$key = $config[$key];
338 337
 					}
339
-				}
340
-				else
338
+				} else
341 339
 				{
342 340
 					$this->$key = $defaults[$key];
343 341
 				}
344 342
 			}
345
-		}
346
-		else
343
+		} else
347 344
 		{
348 345
 			foreach ($config as $key => &$value)
349 346
 			{
@@ -352,8 +349,7 @@  discard block
 block discarded – undo
352 349
 					if ($reflection->hasMethod('set_'.$key))
353 350
 					{
354 351
 						$this->{'set_'.$key}($value);
355
-					}
356
-					else
352
+					} else
357 353
 					{
358 354
 						$this->$key = $value;
359 355
 					}
@@ -415,9 +411,11 @@  discard block
 block discarded – undo
415 411
 		}
416 412
 
417 413
 		// Was the file able to be uploaded? If not, determine the reason why.
418
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
414
+		if ( ! file_exists($_file['tmp_name'])) {
415
+			// modified by ci-phpunit-test
419 416
 		{
420 417
 			$error = isset($_file['error']) ? $_file['error'] : 4;
418
+		}
421 419
 
422 420
 			switch ($error)
423 421
 			{
@@ -482,8 +480,7 @@  discard block
 block discarded – undo
482 480
 			if (strpos($this->_file_name_override, '.') === FALSE)
483 481
 			{
484 482
 				$this->file_name .= $this->file_ext;
485
-			}
486
-			else
483
+			} else
487 484
 			{
488 485
 				// An extension was provided, let's have it!
489 486
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -687,8 +684,7 @@  discard block
 block discarded – undo
687 684
 		{
688 685
 			$this->set_error('upload_bad_filename', 'debug');
689 686
 			return FALSE;
690
-		}
691
-		else
687
+		} else
692 688
 		{
693 689
 			return $new_filename;
694 690
 		}
@@ -883,8 +879,7 @@  discard block
 block discarded – undo
883 879
 		if (in_array($this->file_type, $png_mimes))
884 880
 		{
885 881
 			$this->file_type = 'image/png';
886
-		}
887
-		elseif (in_array($this->file_type, $jpeg_mimes))
882
+		} elseif (in_array($this->file_type, $jpeg_mimes))
888 883
 		{
889 884
 			$this->file_type = 'image/jpeg';
890 885
 		}
@@ -1150,9 +1145,12 @@  discard block
 block discarded – undo
1150 1145
 
1151 1146
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
1152 1147
 		{
1153
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
1148
+			if (($file = @fopen($file, 'rb')) === FALSE) {
1149
+				// "b" to force binary
1154 1150
 			{
1155
-				return FALSE; // Couldn't open the file, return FALSE
1151
+				return FALSE;
1152
+			}
1153
+			// Couldn't open the file, return FALSE
1156 1154
 			}
1157 1155
 
1158 1156
 			$opening_bytes = fread($file, 256);
@@ -1271,9 +1269,11 @@  discard block
 block discarded – undo
1271 1269
 		if (function_exists('finfo_file'))
1272 1270
 		{
1273 1271
 			$finfo = @finfo_open(FILEINFO_MIME);
1274
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1272
+			if (is_resource($finfo)) {
1273
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1275 1274
 			{
1276 1275
 				$mime = @finfo_file($finfo, $file['tmp_name']);
1276
+			}
1277 1277
 				finfo_close($finfo);
1278 1278
 
1279 1279
 				/* According to the comments section of the PHP manual page,
@@ -1358,10 +1358,12 @@  discard block
 block discarded – undo
1358 1358
 		if (function_exists('mime_content_type'))
1359 1359
 		{
1360 1360
 			$this->file_type = @mime_content_type($file['tmp_name']);
1361
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
1361
+			if (strlen($this->file_type) > 0) {
1362
+				// It's possible that mime_content_type() returns FALSE or an empty string
1362 1363
 			{
1363 1364
 				return;
1364 1365
 			}
1366
+			}
1365 1367
 		}
1366 1368
 
1367 1369
 		$this->file_type = $file['type'];
Please login to merge, or discard this patch.
install.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,17 +15,17 @@
 block discarded – undo
15 15
 
16 16
 // php install.php -s
17 17
 if (isset($argv[1]) && $argv[1] === '-s') {
18
-    $silent = true;
18
+	$silent = true;
19 19
 
20
-    // php install.php -s app
21
-    if (isset($argv[2]) && is_dir($argv[2])) {
22
-        $app_dir = $argv[2];
23
-    }
20
+	// php install.php -s app
21
+	if (isset($argv[2]) && is_dir($argv[2])) {
22
+		$app_dir = $argv[2];
23
+	}
24 24
 }
25 25
 
26 26
 // php install.php app
27 27
 if (isset($argv[1]) && is_dir($argv[1])) {
28
-    $app_dir = $argv[1];
28
+	$app_dir = $argv[1];
29 29
 }
30 30
 
31 31
 $installer = new Installer($silent);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
  * @link       https://github.com/kenjis/ci-phpunit-test
9 9
  */
10 10
 
11
-require __DIR__ . '/Installer.php';
11
+require __DIR__.'/Installer.php';
12 12
 
13 13
 $silent = false;
14 14
 $app_dir = 'application';
Please login to merge, or discard this patch.