@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * |
38 | 38 | * @param string $function function name |
39 | 39 | * @param mixed $return_value return value or callable |
40 | - * @param string $class_name class::method to apply this patch |
|
40 | + * @param string $class_method class::method to apply this patch |
|
41 | 41 | * |
42 | 42 | * @throws LogicException |
43 | 43 | */ |
@@ -86,6 +86,9 @@ discard block |
||
86 | 86 | InvocationVerifier::verify(self::$expected_invocations, self::$invocations); |
87 | 87 | } |
88 | 88 | |
89 | + /** |
|
90 | + * @param string $function |
|
91 | + */ |
|
89 | 92 | protected static function logInvocation($function, $arguments) |
90 | 93 | { |
91 | 94 | if (MonkeyPatchManager::$debug) |
@@ -111,6 +114,9 @@ discard block |
||
111 | 114 | } |
112 | 115 | } |
113 | 116 | |
117 | + /** |
|
118 | + * @param string $function |
|
119 | + */ |
|
114 | 120 | protected static function checkCalledMethod($function) |
115 | 121 | { |
116 | 122 | $trace = debug_backtrace(); |
@@ -184,6 +190,9 @@ discard block |
||
184 | 190 | return call_user_func_array($function, $arguments); |
185 | 191 | } |
186 | 192 | |
193 | + /** |
|
194 | + * @param string $function |
|
195 | + */ |
|
187 | 196 | protected static function checkPassedByReference($function) |
188 | 197 | { |
189 | 198 | $ref_func = new ReflectionFunction($function); |
@@ -15,7 +15,6 @@ |
||
15 | 15 | use LogicException; |
16 | 16 | use ReflectionFunction; |
17 | 17 | use ReflectionException; |
18 | - |
|
19 | 18 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
20 | 19 | use Kenjis\MonkeyPatch\Patcher\Backtrace; |
21 | 20 | use Kenjis\MonkeyPatch\MonkeyPatchManager; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | self::outputMessage($msg); |
52 | 52 | throw new LogicException($msg); |
53 | 53 | } |
54 | - if (! FunctionPatcher::isWhitelisted($function)) |
|
54 | + if ( ! FunctionPatcher::isWhitelisted($function)) |
|
55 | 55 | { |
56 | 56 | $msg = "<red>Can't patch on '$function'. It is not in whitelist. If you want to patch it, please add it to 'functions_to_patch' in 'tests/Bootstrap.php'. But note that there are some limitations. See <https://github.com/kenjis/ci-phpunit-test/blob/master/docs/HowToWriteTests.md#patching-functions> for details.</red>"; |
57 | 57 | self::outputMessage($msg); |
@@ -97,16 +97,16 @@ discard block |
||
97 | 97 | $line = $info['line']; |
98 | 98 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
99 | 99 | |
100 | - $log_args = function () use ($arguments) { |
|
100 | + $log_args = function() use ($arguments) { |
|
101 | 101 | $output = ''; |
102 | 102 | foreach ($arguments as $arg) { |
103 | - $output .= var_export($arg, true) . ', '; |
|
103 | + $output .= var_export($arg, true).', '; |
|
104 | 104 | } |
105 | 105 | $output = rtrim($output, ', '); |
106 | 106 | return $output; |
107 | 107 | }; |
108 | 108 | MonkeyPatchManager::log( |
109 | - 'invoke_func: ' . $function . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
109 | + 'invoke_func: '.$function.'('.$log_args().') on line '.$line.' in '.$file.' by '.$method.'()' |
|
110 | 110 | ); |
111 | 111 | } |
112 | 112 | } |
@@ -148,10 +148,10 @@ discard block |
||
148 | 148 | |
149 | 149 | if (isset(self::$patches_to_apply[$function])) |
150 | 150 | { |
151 | - if (! self::checkCalledMethod($function)) |
|
151 | + if ( ! self::checkCalledMethod($function)) |
|
152 | 152 | { |
153 | 153 | MonkeyPatchManager::log( |
154 | - 'invoke_func: ' . $function . '() not patched (out of scope)' |
|
154 | + 'invoke_func: '.$function.'() not patched (out of scope)' |
|
155 | 155 | ); |
156 | 156 | self::checkPassedByReference($function); |
157 | 157 | return call_user_func_array($function, $arguments); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | if (array_key_exists($function, self::$patches)) |
162 | 162 | { |
163 | - MonkeyPatchManager::log('invoke_func: ' . $function . '() patched'); |
|
163 | + MonkeyPatchManager::log('invoke_func: '.$function.'() patched'); |
|
164 | 164 | |
165 | 165 | if (is_callable(self::$patches[$function])) |
166 | 166 | { |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | MonkeyPatchManager::log( |
181 | - 'invoke_func: ' . $function . '() not patched (no patch)' |
|
181 | + 'invoke_func: '.$function.'() not patched (no patch)' |
|
182 | 182 | ); |
183 | 183 | self::checkPassedByReference($function); |
184 | 184 | return call_user_func_array($function, $arguments); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | $msg = str_replace( |
232 | 232 | ['<red>', '</red>'], [$red_begin, $red_end], $msg |
233 | 233 | ); |
234 | - echo $msg . "\n"; |
|
234 | + echo $msg."\n"; |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -13,8 +13,6 @@ |
||
13 | 13 | require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
14 | 14 | require __DIR__ . '/MethodPatcher/PatchManager.php'; |
15 | 15 | |
16 | -use LogicException; |
|
17 | - |
|
18 | 16 | use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor; |
19 | 17 | |
20 | 18 | class MethodPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
|
14 | -require __DIR__ . '/MethodPatcher/PatchManager.php'; |
|
13 | +require __DIR__.'/MethodPatcher/NodeVisitor.php'; |
|
14 | +require __DIR__.'/MethodPatcher/PatchManager.php'; |
|
15 | 15 | |
16 | 16 | use LogicException; |
17 | 17 | |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | { |
65 | 65 | if ($start_method && $token === '{') |
66 | 66 | { |
67 | - if(self::isVoidFunction($tokens, $key)){ |
|
68 | - $new_source .= '{ ' . self::CODENORET; |
|
67 | + if (self::isVoidFunction($tokens, $key)) { |
|
68 | + $new_source .= '{ '.self::CODENORET; |
|
69 | 69 | } |
70 | - else{ |
|
71 | - $new_source .= '{ ' . self::CODE; |
|
70 | + else { |
|
71 | + $new_source .= '{ '.self::CODE; |
|
72 | 72 | } |
73 | 73 | $start_method = false; |
74 | 74 | $replacement['key'] = key(self::$replacement); |
@@ -100,22 +100,22 @@ discard block |
||
100 | 100 | * @param $key |
101 | 101 | * @return bool |
102 | 102 | */ |
103 | - protected static function isVoidFunction($tokens, $key){ |
|
104 | - if($key - 1 <= 0){ |
|
103 | + protected static function isVoidFunction($tokens, $key) { |
|
104 | + if ($key - 1 <= 0) { |
|
105 | 105 | return false; |
106 | 106 | } |
107 | 107 | $token = $tokens[$key - 1]; |
108 | - if(is_array($token)){ |
|
108 | + if (is_array($token)) { |
|
109 | 109 | $token = $token[1]; |
110 | 110 | } |
111 | 111 | //Loop backwards though the start of the function block till you either find "void" or the end of the |
112 | 112 | //parameters declaration. |
113 | - while($token !== ")"){ |
|
114 | - if(strpos($token, "void") !== false){ |
|
113 | + while ($token !== ")") { |
|
114 | + if (strpos($token, "void") !== false) { |
|
115 | 115 | return true; |
116 | 116 | } |
117 | 117 | $token = $tokens[$key - 1]; |
118 | - if(is_array($token)){ |
|
118 | + if (is_array($token)) { |
|
119 | 119 | $token = $token[1]; |
120 | 120 | } |
121 | 121 | $key--; |
@@ -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 | } |
@@ -13,7 +13,6 @@ |
||
13 | 13 | use PhpParser\Node; |
14 | 14 | use PhpParser\Node\Stmt\ClassMethod; |
15 | 15 | use PhpParser\NodeVisitorAbstract; |
16 | - |
|
17 | 16 | use Kenjis\MonkeyPatch\Patcher\MethodPatcher; |
18 | 17 | |
19 | 18 | class NodeVisitor extends NodeVisitorAbstract |
@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | public function leaveNode(Node $node) |
22 | 22 | { |
23 | - if (! ($node instanceof ClassMethod)) |
|
23 | + if ( ! ($node instanceof ClassMethod)) |
|
24 | 24 | { |
25 | 25 | return; |
26 | 26 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | /** |
238 | 238 | * Fetch an item from the GET array |
239 | 239 | * |
240 | - * @param mixed $index Index for item to be fetched from $_GET |
|
240 | + * @param string $index Index for item to be fetched from $_GET |
|
241 | 241 | * @param bool $xss_clean Whether to apply XSS filtering |
242 | 242 | * @return mixed |
243 | 243 | * |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | /** |
254 | 254 | * Fetch an item from the POST array |
255 | 255 | * |
256 | - * @param mixed $index Index for item to be fetched from $_POST |
|
256 | + * @param string $index Index for item to be fetched from $_POST |
|
257 | 257 | * @param bool $xss_clean Whether to apply XSS filtering |
258 | 258 | * @return mixed |
259 | 259 | * |
@@ -321,9 +321,9 @@ discard block |
||
321 | 321 | /** |
322 | 322 | * Fetch an item from the SERVER array |
323 | 323 | * |
324 | - * @param mixed $index Index for item to be fetched from $_SERVER |
|
324 | + * @param string $index Index for item to be fetched from $_SERVER |
|
325 | 325 | * @param bool $xss_clean Whether to apply XSS filtering |
326 | - * @return mixed |
|
326 | + * @return string |
|
327 | 327 | * |
328 | 328 | * @codeCoverageIgnore |
329 | 329 | */ |
@@ -934,7 +934,7 @@ discard block |
||
934 | 934 | * Allows read access to protected properties |
935 | 935 | * |
936 | 936 | * @param string $name |
937 | - * @return mixed |
|
937 | + * @return string|null |
|
938 | 938 | * |
939 | 939 | * @codeCoverageIgnore |
940 | 940 | */ |
@@ -200,29 +200,30 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -139,17 +139,17 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function __construct() |
141 | 141 | { |
142 | - $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
143 | - $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
144 | - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
145 | - $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
142 | + $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
143 | + $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
144 | + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
145 | + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
146 | 146 | |
147 | - $this->security =& load_class('Security', 'core'); |
|
147 | + $this->security = & load_class('Security', 'core'); |
|
148 | 148 | |
149 | 149 | // Do we need the UTF-8 class? |
150 | 150 | if (UTF8_ENABLED === TRUE) |
151 | 151 | { |
152 | - $this->uni =& load_class('Utf8', 'core'); |
|
152 | + $this->uni = & load_class('Utf8', 'core'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | // Sanitize global arrays |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | |
430 | 430 | // Save cookie in Output object |
431 | 431 | // added by ci-phpunit-test |
432 | - $CI =& get_instance(); |
|
432 | + $CI = & get_instance(); |
|
433 | 433 | $output = $CI->output; |
434 | 434 | $output->_cookies[$prefix.$name][] = [ |
435 | 435 | 'value' => $value, |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public function enterNode(Node $node) |
26 | 26 | { |
27 | - $callback = [$this, 'before' . ucfirst($node->getType())]; |
|
27 | + $callback = [$this, 'before'.ucfirst($node->getType())]; |
|
28 | 28 | if (is_callable($callback)) { |
29 | 29 | call_user_func_array($callback, [$node]); |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function leaveNode(Node $node) |
34 | 34 | { |
35 | - if (! ($node instanceof ConstFetch)) |
|
35 | + if ( ! ($node instanceof ConstFetch)) |
|
36 | 36 | { |
37 | - $callback = [$this, 'rewrite' . ucfirst($node->getType())]; |
|
37 | + $callback = [$this, 'rewrite'.ucfirst($node->getType())]; |
|
38 | 38 | if (is_callable($callback)) { |
39 | 39 | call_user_func_array($callback, [$node]); |
40 | 40 | } |
@@ -47,23 +47,23 @@ discard block |
||
47 | 47 | return; |
48 | 48 | } |
49 | 49 | |
50 | - if (! ($node->name instanceof Name)) |
|
50 | + if ( ! ($node->name instanceof Name)) |
|
51 | 51 | { |
52 | 52 | return; |
53 | 53 | } |
54 | 54 | |
55 | - if (! $node->name->isUnqualified()) |
|
55 | + if ( ! $node->name->isUnqualified()) |
|
56 | 56 | { |
57 | 57 | return; |
58 | 58 | } |
59 | 59 | |
60 | - if (! ConstantPatcher::isBlacklisted((string) $node->name)) |
|
60 | + if ( ! ConstantPatcher::isBlacklisted((string) $node->name)) |
|
61 | 61 | { |
62 | - $replacement = new FullyQualified('\__ConstProxy__::get(\'' . (string) $node->name . '\')'); |
|
62 | + $replacement = new FullyQualified('\__ConstProxy__::get(\''.(string) $node->name.'\')'); |
|
63 | 63 | |
64 | 64 | $pos = $node->getAttribute('startTokenPos'); |
65 | 65 | ConstantPatcher::$replacement[$pos] = |
66 | - '\__ConstProxy__::get(\'' . (string) $node->name .'\')'; |
|
66 | + '\__ConstProxy__::get(\''.(string) $node->name.'\')'; |
|
67 | 67 | |
68 | 68 | $node->name = $replacement; |
69 | 69 | } |
@@ -15,7 +15,6 @@ |
||
15 | 15 | use PhpParser\Node\Name; |
16 | 16 | use PhpParser\Node\Name\FullyQualified; |
17 | 17 | use PhpParser\NodeVisitorAbstract; |
18 | - |
|
19 | 18 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher; |
20 | 19 | |
21 | 20 | class NodeVisitor extends NodeVisitorAbstract |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/../Exception/ExitException.php'; |
|
13 | +require __DIR__.'/../Exception/ExitException.php'; |
|
14 | 14 | |
15 | 15 | class ExitPatcher |
16 | 16 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | elseif ($token[0] === T_EXIT) |
32 | 32 | { |
33 | - if ($tokens[$i+1] === ';') |
|
33 | + if ($tokens[$i + 1] === ';') |
|
34 | 34 | { |
35 | 35 | $new_source .= 'exit__()'; |
36 | 36 | } |
@@ -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 | } |
@@ -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 | } |
@@ -66,16 +66,16 @@ |
||
66 | 66 | $called_method = 'n/a'; |
67 | 67 | } |
68 | 68 | |
69 | - $log_args = function () use ($params) { |
|
69 | + $log_args = function() use ($params) { |
|
70 | 70 | $output = ''; |
71 | 71 | foreach ($params as $arg) { |
72 | - $output .= var_export($arg, true) . ', '; |
|
72 | + $output .= var_export($arg, true).', '; |
|
73 | 73 | } |
74 | 74 | $output = rtrim($output, ', '); |
75 | 75 | return $output; |
76 | 76 | }; |
77 | 77 | MonkeyPatchManager::log( |
78 | - 'invoke_method: ' . $class.'::'.$method . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $called_method |
|
78 | + 'invoke_method: '.$class.'::'.$method.'('.$log_args().') on line '.$line.' in '.$file.' by '.$called_method |
|
79 | 79 | ); |
80 | 80 | // var_dump($trace); exit; |
81 | 81 | } |
@@ -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 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/../Exception/ExitException.php'; |
|
13 | +require __DIR__.'/../Exception/ExitException.php'; |
|
14 | 14 | |
15 | 15 | class ExitPatcher |
16 | 16 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | elseif ($token[0] === T_EXIT) |
32 | 32 | { |
33 | - if ($tokens[$i+1] === ';') |
|
33 | + if ($tokens[$i + 1] === ';') |
|
34 | 34 | { |
35 | 35 | $new_source .= 'exit__()'; |
36 | 36 | } |
@@ -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 | } |