Completed
Pull Request — master (#299)
by
unknown
02:38
created
application/tests/_ci_phpunit_test/replacing/core/old/3.1.9-CodeIgniter.php 1 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.
tests/_ci_phpunit_test/replacing/helpers/old/3.1.9-url_helper.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,16 +63,14 @@  discard block
 block discarded – undo
63 63
 		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE)
64 64
 		{
65 65
 			$method = 'refresh';
66
-		}
67
-		elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
66
+		} elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
68 67
 		{
69 68
 			if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1')
70 69
 			{
71 70
 				$code = ($_SERVER['REQUEST_METHOD'] !== 'GET')
72 71
 					? 303	// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
73 72
 					: 307;
74
-			}
75
-			else
73
+			} else
76 74
 			{
77 75
 				$code = 302;
78 76
 			}
@@ -97,8 +95,7 @@  discard block
 block discarded – undo
97 95
 		if (ENVIRONMENT !== 'testing')
98 96
 		{
99 97
 			exit;
100
-		}
101
-		else
98
+		} else
102 99
 		{
103 100
 			while (ob_get_level() > 1)
104 101
 			{
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/replacing/helpers/old/3.1.9-download_helper.php 1 patch
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.
application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.9-Upload.php 1 patch
Braces   +20 added lines, -17 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);
@@ -881,8 +878,7 @@  discard block
 block discarded – undo
881 878
 		if (in_array($this->file_type, $png_mimes))
882 879
 		{
883 880
 			$this->file_type = 'image/png';
884
-		}
885
-		elseif (in_array($this->file_type, $jpeg_mimes))
881
+		} elseif (in_array($this->file_type, $jpeg_mimes))
886 882
 		{
887 883
 			$this->file_type = 'image/jpeg';
888 884
 		}
@@ -1148,9 +1144,12 @@  discard block
 block discarded – undo
1148 1144
 
1149 1145
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
1150 1146
 		{
1151
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
1147
+			if (($file = @fopen($file, 'rb')) === FALSE) {
1148
+				// "b" to force binary
1152 1149
 			{
1153
-				return FALSE; // Couldn't open the file, return FALSE
1150
+				return FALSE;
1151
+			}
1152
+			// Couldn't open the file, return FALSE
1154 1153
 			}
1155 1154
 
1156 1155
 			$opening_bytes = fread($file, 256);
@@ -1269,9 +1268,11 @@  discard block
 block discarded – undo
1269 1268
 		if (function_exists('finfo_file'))
1270 1269
 		{
1271 1270
 			$finfo = @finfo_open(FILEINFO_MIME);
1272
-			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
1271
+			if (is_resource($finfo)) {
1272
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1273 1273
 			{
1274 1274
 				$mime = @finfo_file($finfo, $file['tmp_name']);
1275
+			}
1275 1276
 				finfo_close($finfo);
1276 1277
 
1277 1278
 				/* According to the comments section of the PHP manual page,
@@ -1356,10 +1357,12 @@  discard block
 block discarded – undo
1356 1357
 		if (function_exists('mime_content_type'))
1357 1358
 		{
1358 1359
 			$this->file_type = @mime_content_type($file['tmp_name']);
1359
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
1360
+			if (strlen($this->file_type) > 0) {
1361
+				// It's possible that mime_content_type() returns FALSE or an empty string
1360 1362
 			{
1361 1363
 				return;
1362 1364
 			}
1365
+			}
1363 1366
 		}
1364 1367
 
1365 1368
 		$this->file_type = $file['type'];
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.x/MonkeyPatchManager.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,7 @@
 block discarded – undo
70 70
 		if (isset($config['root_dir']))
71 71
 		{
72 72
 			Cache::setProjectRootDir($config['root_dir']);
73
-		}
74
-		else
73
+		} else
75 74
 		{
76 75
 			// APPPATH is constant in CodeIgniter
77 76
 			Cache::setProjectRootDir(APPPATH . '../');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.x/Patcher/ConstantPatcher.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -181,8 +181,7 @@  discard block
 block discarded – undo
181 181
 			if (is_string($token))
182 182
 			{
183 183
 				$new_source .= $token;
184
-			}
185
-			elseif ($i == $replacement['key'])
184
+			} elseif ($i == $replacement['key'])
186 185
 			{
187 186
 				$new_source .= $replacement['value'];
188 187
 				$replacement['key'] = key(self::$replacement);
@@ -192,8 +191,7 @@  discard block
 block discarded – undo
192 191
 				{
193 192
 					$replacement = false;
194 193
 				}
195
-			}
196
-			else
194
+			} else
197 195
 			{
198 196
 				$new_source .= $token[1];
199 197
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.x/Patcher/Backtrace.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,8 +47,7 @@  discard block
 block discarded – undo
47 47
 					? $backtrace[$offset+2]['class']
48 48
 					: null;
49 49
 			$function = $backtrace[$offset+2]['function'];
50
-		}
51
-		else
50
+		} else
52 51
 		{
53 52
 			$class = null;
54 53
 			$function = null;
@@ -59,8 +58,7 @@  discard block
 block discarded – undo
59 58
 			$method = $function;
60 59
 			$class_method = $class . '::' . $function;
61 60
 			$function = null;
62
-		}
63
-		else
61
+		} else
64 62
 		{
65 63
 			$method = null;
66 64
 			$class_method = null;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.x/Patcher/AbstractPatcher.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@
 block discarded – undo
38 38
 		{
39 39
 			$patched = true;
40 40
 			$new_source = static::generateNewSource($source);
41
-		}
42
-		else
41
+		} else
43 42
 		{
44 43
 			$new_source = $source;
45 44
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/4.x/Patcher/MethodPatcher/PatchManager.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,12 +56,10 @@  discard block
 block discarded – undo
56 56
 			if (isset($info['class_method']))
57 57
 			{
58 58
 				$called_method = $info['class_method'];
59
-			}
60
-			elseif (isset($info['function']))
59
+			} elseif (isset($info['function']))
61 60
 			{
62 61
 				$called_method = $info['function'];
63
-			}
64
-			else
62
+			} else
65 63
 			{
66 64
 				$called_method = 'n/a';
67 65
 			}
@@ -88,8 +86,7 @@  discard block
 block discarded – undo
88 86
 		)
89 87
 		{
90 88
 			$patch = self::$patches[$class][$method];
91
-		}
92
-		else
89
+		} else
93 90
 		{
94 91
 			return __GO_TO_ORIG__;
95 92
 		}
Please login to merge, or discard this patch.