Completed
Pull Request — master (#364)
by Kenji
02:19
created
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
@@ -48,8 +48,7 @@
 block discarded – undo
48 48
 		{
49 49
 			$patched = true;
50 50
 			$new_source = static::generateNewSource($source_);
51
-		}
52
-		else
51
+		} else
53 52
 		{
54 53
 			$new_source = $source;
55 54
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.5/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.5/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.
tests/_ci_phpunit_test/patcher/4.5/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/4.5/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/4.5/Patcher/MethodPatcher.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,8 +66,7 @@  discard block
 block discarded – undo
66 66
 				{
67 67
 					if(self::isVoidFunction($tokens, $key)){
68 68
 						$new_source .= '{ ' . self::CODENORET;
69
-					}
70
-					else{
69
+					} else{
71 70
 						$new_source .= '{ ' . self::CODE;
72 71
 					}
73 72
 					$start_method = false;
@@ -78,13 +77,11 @@  discard block
 block discarded – undo
78 77
 					{
79 78
 						$replacement = false;
80 79
 					}
81
-				}
82
-				else
80
+				} else
83 81
 				{
84 82
 					$new_source .= $token;
85 83
 				}
86
-			}
87
-			else
84
+			} else
88 85
 			{
89 86
 				$new_source .= $token[1];
90 87
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/bootstrap.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,16 +19,13 @@
 block discarded – undo
19 19
 	if ($phpParserVersion->isGreaterThanOrEqualTo('4.6')) {
20 20
 		// PHP-Parser 4.6 -
21 21
 		require __DIR__ . '/4.x/MonkeyPatchManager.php';
22
-	}
23
-	elseif ($phpParserVersion->isGreaterThanOrEqualTo('4.0')) {
22
+	} elseif ($phpParserVersion->isGreaterThanOrEqualTo('4.0')) {
24 23
 		// PHP-Parser 4.0 - 4.5
25 24
 		require __DIR__ . '/4.5/MonkeyPatchManager.php';
26
-	}
27
-	elseif ($phpParserVersion->isGreaterThanOrEqualTo('3.0')) {
25
+	} elseif ($phpParserVersion->isGreaterThanOrEqualTo('3.0')) {
28 26
 		// PHP-Parser 3.x
29 27
 		require __DIR__ . '/3.x/MonkeyPatchManager.php';
30
-	}
31
-	else {
28
+	} else {
32 29
 		// PHP-Parser 2.x
33 30
 		require __DIR__ . '/2.x/MonkeyPatchManager.php';
34 31
 	}
Please login to merge, or discard this patch.