Completed
Pull Request — master (#88)
by Kenji
04:13
created
application/tests/_ci_phpunit_test/replacing/core/Input.php 1 patch
Braces   +16 added lines, -23 removed lines patch added patch discarded remove patch
@@ -196,29 +196,30 @@  discard block
 block discarded – undo
196 196
 		if (isset($array[$index]))
197 197
 		{
198 198
 			$value = $array[$index];
199
-		}
200
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
199
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
200
+			// Does the index contain array notation
201 201
 		{
202 202
 			$value = $array;
203
+		}
203 204
 			for ($i = 0; $i < $count; $i++)
204 205
 			{
205 206
 				$key = trim($matches[0][$i], '[]');
206
-				if ($key === '') // Empty notation will return the value as array
207
+				if ($key === '') {
208
+					// Empty notation will return the value as array
207 209
 				{
208 210
 					break;
209 211
 				}
212
+				}
210 213
 
211 214
 				if (isset($value[$key]))
212 215
 				{
213 216
 					$value = $value[$key];
214
-				}
215
-				else
217
+				} else
216 218
 				{
217 219
 					return NULL;
218 220
 				}
219 221
 			}
220
-		}
221
-		else
222
+		} else
222 223
 		{
223 224
 			return NULL;
224 225
 		}
@@ -403,8 +404,7 @@  discard block
 block discarded – undo
403 404
 		if ( ! is_numeric($expire))
404 405
 		{
405 406
 			$expire = time() - 86500;
406
-		}
407
-		else
407
+		} else
408 408
 		{
409 409
 			$expire = ($expire > 0) ? time() + $expire : 0;
410 410
 		}
@@ -463,8 +463,7 @@  discard block
 block discarded – undo
463 463
 					if ( ! $this->valid_ip($spoof))
464 464
 					{
465 465
 						$spoof = NULL;
466
-					}
467
-					else
466
+					} else
468 467
 					{
469 468
 						break;
470 469
 					}
@@ -517,8 +516,7 @@  discard block
 block discarded – undo
517 516
 							}
518 517
 
519 518
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
520
-						}
521
-						else
519
+						} else
522 520
 						{
523 521
 							$ip = explode('.', $this->ip_address);
524 522
 							$sprintf = '%08b%08b%08b%08b';
@@ -538,8 +536,7 @@  discard block
 block discarded – undo
538 536
 						{
539 537
 							$netaddr[$i] = intval($netaddr[$i], 16);
540 538
 						}
541
-					}
542
-					else
539
+					} else
543 540
 					{
544 541
 						$netaddr = explode('.', $netaddr);
545 542
 					}
@@ -620,8 +617,7 @@  discard block
 block discarded – undo
620 617
 		if ($this->_allow_get_array === FALSE)
621 618
 		{
622 619
 			$_GET = array();
623
-		}
624
-		elseif (is_array($_GET))
620
+		} elseif (is_array($_GET))
625 621
 		{
626 622
 			foreach ($_GET as $key => $val)
627 623
 			{
@@ -657,8 +653,7 @@  discard block
 block discarded – undo
657 653
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
658 654
 				{
659 655
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
660
-				}
661
-				else
656
+				} else
662 657
 				{
663 658
 					unset($_COOKIE[$key]);
664 659
 				}
@@ -744,8 +739,7 @@  discard block
 block discarded – undo
744 739
 			if ($fatal === TRUE)
745 740
 			{
746 741
 				return FALSE;
747
-			}
748
-			else
742
+			} else
749 743
 			{
750 744
 				set_status_header(503);
751 745
 				echo 'Disallowed Key Characters.';
@@ -900,8 +894,7 @@  discard block
 block discarded – undo
900 894
 		{
901 895
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
902 896
 			return $this->_raw_input_stream;
903
-		}
904
-		elseif ($name === 'ip_address')
897
+		} elseif ($name === 'ip_address')
905 898
 		{
906 899
 			return $this->ip_address;
907 900
 		}
Please login to merge, or discard this patch.