@@ -70,8 +70,7 @@ |
||
| 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 . '../'); |
@@ -181,8 +181,7 @@ discard block |
||
| 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 |
||
| 192 | 191 | { |
| 193 | 192 | $replacement = false; |
| 194 | 193 | } |
| 195 | - } |
|
| 196 | - else |
|
| 194 | + } else |
|
| 197 | 195 | { |
| 198 | 196 | $new_source .= $token[1]; |
| 199 | 197 | } |
@@ -47,8 +47,7 @@ discard block |
||
| 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 |
||
| 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; |
@@ -38,8 +38,7 @@ |
||
| 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 | } |
@@ -56,12 +56,10 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -66,8 +66,7 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -181,8 +181,7 @@ discard block |
||
| 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 |
||
| 192 | 191 | { |
| 193 | 192 | $replacement = false; |
| 194 | 193 | } |
| 195 | - } |
|
| 196 | - else |
|
| 194 | + } else |
|
| 197 | 195 | { |
| 198 | 196 | $new_source .= $token[1]; |
| 199 | 197 | } |
@@ -27,20 +27,17 @@ |
||
| 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 | } |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | if (class_exists('PhpParser\Node\Identifier')) { |
| 14 | 14 | // PHP-Parser 4.x |
| 15 | 15 | require __DIR__ . '/4.x/MonkeyPatchManager.php'; |
| 16 | - } |
|
| 17 | - elseif (method_exists('PhpParser\Node\Name','set')) { |
|
| 16 | + } elseif (method_exists('PhpParser\Node\Name','set')) { |
|
| 18 | 17 | // PHP-Parser 2.x |
| 19 | 18 | require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
| 20 | 19 | } else { |