Completed
Pull Request — master (#327)
by
unknown
02:25
created
application/tests/_ci_phpunit_test/replacing/helpers/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/CIPHPUnitTestSuperGlobal.php 1 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/core/Input.php 1 patch
Braces   +17 added lines, -25 removed lines patch added patch discarded remove patch
@@ -200,29 +200,30 @@  discard block
 block discarded – undo
200 200
 		if (isset($array[$index]))
201 201
 		{
202 202
 			$value = $array[$index];
203
-		}
204
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
203
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
204
+			// Does the index contain array notation
205 205
 		{
206 206
 			$value = $array;
207
+		}
207 208
 			for ($i = 0; $i < $count; $i++)
208 209
 			{
209 210
 				$key = trim($matches[0][$i], '[]');
210
-				if ($key === '') // Empty notation will return the value as array
211
+				if ($key === '') {
212
+					// Empty notation will return the value as array
211 213
 				{
212 214
 					break;
213 215
 				}
216
+				}
214 217
 
215 218
 				if (isset($value[$key]))
216 219
 				{
217 220
 					$value = $value[$key];
218
-				}
219
-				else
221
+				} else
220 222
 				{
221 223
 					return NULL;
222 224
 				}
223 225
 			}
224
-		}
225
-		else
226
+		} else
226 227
 		{
227 228
 			return NULL;
228 229
 		}
@@ -421,8 +422,7 @@  discard block
 block discarded – undo
421 422
 		if ( ! is_numeric($expire))
422 423
 		{
423 424
 			$expire = time() - 86500;
424
-		}
425
-		else
425
+		} else
426 426
 		{
427 427
 			$expire = ($expire > 0) ? time() + $expire : 0;
428 428
 		}
@@ -483,8 +483,7 @@  discard block
 block discarded – undo
483 483
 					if ( ! $this->valid_ip($spoof))
484 484
 					{
485 485
 						$spoof = NULL;
486
-					}
487
-					else
486
+					} else
488 487
 					{
489 488
 						break;
490 489
 					}
@@ -537,8 +536,7 @@  discard block
 block discarded – undo
537 536
 							}
538 537
 
539 538
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
540
-						}
541
-						else
539
+						} else
542 540
 						{
543 541
 							$ip = explode('.', $this->ip_address);
544 542
 							$sprintf = '%08b%08b%08b%08b';
@@ -558,8 +556,7 @@  discard block
 block discarded – undo
558 556
 						{
559 557
 							$netaddr[$j] = intval($netaddr[$j], 16);
560 558
 						}
561
-					}
562
-					else
559
+					} else
563 560
 					{
564 561
 						$netaddr = explode('.', $netaddr);
565 562
 					}
@@ -646,8 +643,7 @@  discard block
 block discarded – undo
646 643
 		if ($this->_allow_get_array === FALSE)
647 644
 		{
648 645
 			$_GET = array();
649
-		}
650
-		elseif (is_array($_GET))
646
+		} elseif (is_array($_GET))
651 647
 		{
652 648
 			foreach ($_GET as $key => $val)
653 649
 			{
@@ -683,8 +679,7 @@  discard block
 block discarded – undo
683 679
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
684 680
 				{
685 681
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
686
-				}
687
-				else
682
+				} else
688 683
 				{
689 684
 					unset($_COOKIE[$key]);
690 685
 				}
@@ -774,8 +769,7 @@  discard block
 block discarded – undo
774 769
 			if ($fatal === TRUE)
775 770
 			{
776 771
 				return FALSE;
777
-			}
778
-			else
772
+			} else
779 773
 			{
780 774
 				set_status_header(503);
781 775
 				echo 'Disallowed Key Characters.';
@@ -814,8 +808,7 @@  discard block
 block discarded – undo
814 808
 		if (function_exists('apache_request_headers'))
815 809
 		{
816 810
 			$this->headers = apache_request_headers();
817
-		}
818
-		else
811
+		} else
819 812
 		{
820 813
 			isset($_SERVER['CONTENT_TYPE']) && $this->headers['Content-Type'] = $_SERVER['CONTENT_TYPE'];
821 814
 
@@ -944,8 +937,7 @@  discard block
 block discarded – undo
944 937
 		{
945 938
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
946 939
 			return $this->_raw_input_stream;
947
-		}
948
-		elseif ($name === 'ip_address')
940
+		} elseif ($name === 'ip_address')
949 941
 		{
950 942
 			return $this->ip_address;
951 943
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestAutoloader.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -44,8 +44,7 @@  discard block
 block discarded – undo
44 44
 				APPPATH.'modules',
45 45
 				APPPATH.'hooks',
46 46
 			];
47
-		}
48
-		else
47
+		} else
49 48
 		{
50 49
 			$this->dirs = $dirs;
51 50
 		}
@@ -86,8 +85,7 @@  discard block
 block discarded – undo
86 85
 		{
87 86
 			$dir = __DIR__;
88 87
 			$this->loadClassFile($dir, $class);
89
-		}
90
-		else
88
+		} else
91 89
 		{
92 90
 			$dir = __DIR__ . '/exceptions';
93 91
 			$this->loadClassFile($dir, $class);
@@ -152,8 +150,7 @@  discard block
 block discarded – undo
152 150
 			{
153 151
 				require $filename;
154 152
 				return true;
155
-			}
156
-			else
153
+			} else
157 154
 			{
158 155
 				unset($this->cache[$class]);
159 156
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/ExitPatcher.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,20 +27,17 @@
 block discarded – undo
27 27
 			if (is_string($token))
28 28
 			{
29 29
 				$new_source .= $token;
30
-			}
31
-			elseif ($token[0] === T_EXIT)
30
+			} elseif ($token[0] === T_EXIT)
32 31
 			{
33 32
 				if ($tokens[$i+1] === ';')
34 33
 				{
35 34
 					$new_source .= 'exit__()';
36
-				}
37
-				else
35
+				} else
38 36
 				{
39 37
 					$new_source .= 'exit__';
40 38
 				}
41 39
 				$patched = true;
42
-			}
43
-			else
40
+			} else
44 41
 			{
45 42
 				$new_source .= $token[1];
46 43
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.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/3.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.
application/tests/_ci_phpunit_test/patcher/3.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/3.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.