@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * Start the timer... tick tock tick tock... |
186 | 186 | * ------------------------------------------------------ |
187 | 187 | */ |
188 | - $BM =& load_class('Benchmark', 'core'); |
|
188 | + $BM = & load_class('Benchmark', 'core'); |
|
189 | 189 | CIPHPUnitTestSuperGlobal::set_Global('BM', $BM); |
190 | 190 | $BM->mark('total_execution_time_start'); |
191 | 191 | $BM->mark('loading_time:_base_classes_start'); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * Instantiate the hooks class |
196 | 196 | * ------------------------------------------------------ |
197 | 197 | */ |
198 | - $EXT =& load_class('Hooks', 'core'); |
|
198 | + $EXT = & load_class('Hooks', 'core'); |
|
199 | 199 | CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); |
200 | 200 | |
201 | 201 | /* |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | * depending on another class that uses it. |
216 | 216 | * |
217 | 217 | */ |
218 | - $CFG =& load_class('Config', 'core'); |
|
218 | + $CFG = & load_class('Config', 'core'); |
|
219 | 219 | CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); |
220 | 220 | |
221 | 221 | // Do we have any manually set config items in the index.php file? |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | * Instantiate the UTF-8 class |
295 | 295 | * ------------------------------------------------------ |
296 | 296 | */ |
297 | - $UNI =& load_class('Utf8', 'core'); |
|
297 | + $UNI = & load_class('Utf8', 'core'); |
|
298 | 298 | CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); |
299 | 299 | |
300 | 300 | /* |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * Instantiate the URI class |
303 | 303 | * ------------------------------------------------------ |
304 | 304 | */ |
305 | - $URI =& load_class('URI', 'core'); |
|
305 | + $URI = & load_class('URI', 'core'); |
|
306 | 306 | CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); |
307 | 307 | |
308 | 308 | /* |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | * Instantiate the routing class and set the routing |
311 | 311 | * ------------------------------------------------------ |
312 | 312 | */ |
313 | - $RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
313 | + $RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
314 | 314 | CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR); |
315 | 315 | |
316 | 316 | /* |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | * Instantiate the output class |
319 | 319 | * ------------------------------------------------------ |
320 | 320 | */ |
321 | - $OUT =& load_class('Output', 'core'); |
|
321 | + $OUT = & load_class('Output', 'core'); |
|
322 | 322 | CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT); |
323 | 323 | |
324 | 324 | /* |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | * Load the security class for xss and csrf support |
337 | 337 | * ----------------------------------------------------- |
338 | 338 | */ |
339 | - $SEC =& load_class('Security', 'core'); |
|
339 | + $SEC = & load_class('Security', 'core'); |
|
340 | 340 | CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC); |
341 | 341 | |
342 | 342 | /* |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | * Load the Input class and sanitize globals |
345 | 345 | * ------------------------------------------------------ |
346 | 346 | */ |
347 | - $IN =& load_class('Input', 'core'); |
|
347 | + $IN = & load_class('Input', 'core'); |
|
348 | 348 | CIPHPUnitTestSuperGlobal::set_Global('IN', $IN); |
349 | 349 | |
350 | 350 | /* |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | * Load the Language class |
353 | 353 | * ------------------------------------------------------ |
354 | 354 | */ |
355 | - $LANG =& load_class('Lang', 'core'); |
|
355 | + $LANG = & load_class('Lang', 'core'); |
|
356 | 356 | CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG); |
357 | 357 | |
358 | 358 | /* |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | */ |
376 | 376 | function &get_instance() |
377 | 377 | { |
378 | - if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
378 | + if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
379 | 379 | { |
380 | 380 | return CI_Controller::get_instance(); |
381 | 381 | } |
@@ -169,12 +169,10 @@ discard block |
||
169 | 169 | file_exists(APPPATH.'vendor/autoload.php') |
170 | 170 | ? require_once(APPPATH.'vendor/autoload.php') |
171 | 171 | : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.'); |
172 | - } |
|
173 | - elseif (file_exists($composer_autoload)) |
|
172 | + } elseif (file_exists($composer_autoload)) |
|
174 | 173 | { |
175 | 174 | require_once($composer_autoload); |
176 | - } |
|
177 | - else |
|
175 | + } else |
|
178 | 176 | { |
179 | 177 | log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload); |
180 | 178 | } |
@@ -253,8 +251,7 @@ discard block |
||
253 | 251 | // This is required for mb_convert_encoding() to strip invalid characters. |
254 | 252 | // That's utilized by CI_Utf8, but it's also done for consistency with iconv. |
255 | 253 | mb_substitute_character('none'); |
256 | - } |
|
257 | - else |
|
254 | + } else |
|
258 | 255 | { |
259 | 256 | define('MB_ENABLED', FALSE); |
260 | 257 | } |
@@ -267,8 +264,7 @@ discard block |
||
267 | 264 | // iconv.internal_encoding is deprecated starting with PHP 5.6 |
268 | 265 | // and it's usage triggers E_DEPRECATED messages. |
269 | 266 | @ini_set('iconv.internal_encoding', $charset); |
270 | - } |
|
271 | - else |
|
267 | + } else |
|
272 | 268 | { |
273 | 269 | define('ICONV_ENABLED', FALSE); |
274 | 270 | } |
@@ -378,8 +374,7 @@ discard block |
||
378 | 374 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
379 | 375 | { |
380 | 376 | return CI_Controller::get_instance(); |
381 | - } |
|
382 | - else |
|
377 | + } else |
|
383 | 378 | { |
384 | 379 | return CI::$APP; |
385 | 380 | } |
@@ -424,21 +419,18 @@ discard block |
||
424 | 419 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
425 | 420 | { |
426 | 421 | $e404 = TRUE; |
427 | - } |
|
428 | - else |
|
422 | + } else |
|
429 | 423 | { |
430 | 424 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
431 | 425 | |
432 | 426 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
433 | 427 | { |
434 | 428 | $e404 = TRUE; |
435 | - } |
|
436 | - elseif (method_exists($class, '_remap')) |
|
429 | + } elseif (method_exists($class, '_remap')) |
|
437 | 430 | { |
438 | 431 | $params = array($method, array_slice($URI->rsegments, 2)); |
439 | 432 | $method = '_remap'; |
440 | - } |
|
441 | - elseif ( ! method_exists($class, $method)) |
|
433 | + } elseif ( ! method_exists($class, $method)) |
|
442 | 434 | { |
443 | 435 | $e404 = TRUE; |
444 | 436 | } |
@@ -490,8 +482,7 @@ discard block |
||
490 | 482 | $RTR->directory = ''; |
491 | 483 | } |
492 | 484 | } |
493 | - } |
|
494 | - else |
|
485 | + } else |
|
495 | 486 | { |
496 | 487 | $e404 = FALSE; |
497 | 488 | } |
@@ -507,8 +498,7 @@ discard block |
||
507 | 498 | 1 => $class, |
508 | 499 | 2 => $method |
509 | 500 | ); |
510 | - } |
|
511 | - else |
|
501 | + } else |
|
512 | 502 | { |
513 | 503 | show_404($RTR->directory.$class.'/'.$method); |
514 | 504 | } |
@@ -105,7 +105,7 @@ |
||
105 | 105 | ob_end_clean(); |
106 | 106 | } |
107 | 107 | |
108 | - throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code); |
|
108 | + throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
@@ -63,16 +63,14 @@ discard block |
||
63 | 63 | if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE) |
64 | 64 | { |
65 | 65 | $method = 'refresh'; |
66 | - } |
|
67 | - elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) |
|
66 | + } elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) |
|
68 | 67 | { |
69 | 68 | if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1') |
70 | 69 | { |
71 | 70 | $code = ($_SERVER['REQUEST_METHOD'] !== 'GET') |
72 | 71 | ? 303 // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get |
73 | 72 | : 307; |
74 | - } |
|
75 | - else |
|
73 | + } else |
|
76 | 74 | { |
77 | 75 | $code = 302; |
78 | 76 | } |
@@ -97,8 +95,7 @@ discard block |
||
97 | 95 | if (ENVIRONMENT !== 'testing') |
98 | 96 | { |
99 | 97 | exit; |
100 | - } |
|
101 | - else |
|
98 | + } else |
|
102 | 99 | { |
103 | 100 | while (ob_get_level() > 1) |
104 | 101 | { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | // Load the mime types |
104 | - $mimes =& get_mimes(); |
|
104 | + $mimes = & get_mimes(); |
|
105 | 105 | |
106 | 106 | // Only change the default MIME if we can find one |
107 | 107 | if (isset($mimes[$extension])) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | if (ENVIRONMENT === 'testing') |
148 | 148 | { |
149 | - $CI =& get_instance(); |
|
149 | + $CI = & get_instance(); |
|
150 | 150 | $CI->output->set_header('Content-Type: '.$mime); |
151 | 151 | $CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"'); |
152 | 152 | $CI->output->set_header('Expires: 0'); |
@@ -67,8 +67,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | { |
294 | 294 | empty($config) OR $this->initialize($config, FALSE); |
295 | 295 | |
296 | - $this->_mimes =& get_mimes(); |
|
297 | - $this->_CI =& get_instance(); |
|
296 | + $this->_mimes = & get_mimes(); |
|
297 | + $this->_CI = & get_instance(); |
|
298 | 298 | |
299 | 299 | log_message('info', 'Upload Class Initialized'); |
300 | 300 | } |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | else |
481 | 481 | { |
482 | 482 | // An extension was provided, let's have it! |
483 | - $this->file_ext = $this->get_extension($this->_file_name_override); |
|
483 | + $this->file_ext = $this->get_extension($this->_file_name_override); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | if ( ! $this->is_allowed_filetype(TRUE)) |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | // Convert the file size to kilobytes |
494 | 494 | if ($this->file_size > 0) |
495 | 495 | { |
496 | - $this->file_size = round($this->file_size/1024, 2); |
|
496 | + $this->file_size = round($this->file_size / 1024, 2); |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | // Is the file size within the allowed maximum? |
@@ -818,10 +818,10 @@ discard block |
||
818 | 818 | { |
819 | 819 | $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); |
820 | 820 | |
821 | - $this->image_width = $D[0]; |
|
822 | - $this->image_height = $D[1]; |
|
823 | - $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | - $this->image_size_str = $D[3]; // string containing height and width |
|
821 | + $this->image_width = $D[0]; |
|
822 | + $this->image_height = $D[1]; |
|
823 | + $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | + $this->image_size_str = $D[3]; // string containing height and width |
|
825 | 825 | } |
826 | 826 | } |
827 | 827 | |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | $this->file_type = 'image/jpeg'; |
870 | 870 | } |
871 | 871 | |
872 | - $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
872 | + $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
873 | 873 | |
874 | 874 | return in_array($this->file_type, $img_mimes, TRUE); |
875 | 875 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | return FALSE; |
1012 | 1012 | } |
1013 | 1013 | |
1014 | - $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1014 | + $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1015 | 1015 | return TRUE; |
1016 | 1016 | } |
1017 | 1017 | |
@@ -1055,9 +1055,9 @@ discard block |
||
1055 | 1055 | $ext = ''; |
1056 | 1056 | if (strpos($filename, '.') !== FALSE) |
1057 | 1057 | { |
1058 | - $parts = explode('.', $filename); |
|
1059 | - $ext = '.'.array_pop($parts); |
|
1060 | - $filename = implode('.', $parts); |
|
1058 | + $parts = explode('.', $filename); |
|
1059 | + $ext = '.'.array_pop($parts); |
|
1060 | + $filename = implode('.', $parts); |
|
1061 | 1061 | } |
1062 | 1062 | |
1063 | 1063 | return substr($filename, 0, ($length - strlen($ext))).$ext; |
@@ -331,19 +331,16 @@ discard block |
||
331 | 331 | if ($reflection->hasMethod('set_'.$key)) |
332 | 332 | { |
333 | 333 | $this->{'set_'.$key}($config[$key]); |
334 | - } |
|
335 | - else |
|
334 | + } else |
|
336 | 335 | { |
337 | 336 | $this->$key = $config[$key]; |
338 | 337 | } |
339 | - } |
|
340 | - else |
|
338 | + } else |
|
341 | 339 | { |
342 | 340 | $this->$key = $defaults[$key]; |
343 | 341 | } |
344 | 342 | } |
345 | - } |
|
346 | - else |
|
343 | + } else |
|
347 | 344 | { |
348 | 345 | foreach ($config as $key => &$value) |
349 | 346 | { |
@@ -352,8 +349,7 @@ discard block |
||
352 | 349 | if ($reflection->hasMethod('set_'.$key)) |
353 | 350 | { |
354 | 351 | $this->{'set_'.$key}($value); |
355 | - } |
|
356 | - else |
|
352 | + } else |
|
357 | 353 | { |
358 | 354 | $this->$key = $value; |
359 | 355 | } |
@@ -415,9 +411,11 @@ discard block |
||
415 | 411 | } |
416 | 412 | |
417 | 413 | // Was the file able to be uploaded? If not, determine the reason why. |
418 | - if ( ! file_exists($_file['tmp_name'])) // modified by ci-phpunit-test |
|
414 | + if ( ! file_exists($_file['tmp_name'])) { |
|
415 | + // modified by ci-phpunit-test |
|
419 | 416 | { |
420 | 417 | $error = isset($_file['error']) ? $_file['error'] : 4; |
418 | + } |
|
421 | 419 | |
422 | 420 | switch ($error) |
423 | 421 | { |
@@ -482,8 +480,7 @@ discard block |
||
482 | 480 | if (strpos($this->_file_name_override, '.') === FALSE) |
483 | 481 | { |
484 | 482 | $this->file_name .= $this->file_ext; |
485 | - } |
|
486 | - else |
|
483 | + } else |
|
487 | 484 | { |
488 | 485 | // An extension was provided, let's have it! |
489 | 486 | $this->file_ext = $this->get_extension($this->_file_name_override); |
@@ -881,8 +878,7 @@ discard block |
||
881 | 878 | if (in_array($this->file_type, $png_mimes)) |
882 | 879 | { |
883 | 880 | $this->file_type = 'image/png'; |
884 | - } |
|
885 | - elseif (in_array($this->file_type, $jpeg_mimes)) |
|
881 | + } elseif (in_array($this->file_type, $jpeg_mimes)) |
|
886 | 882 | { |
887 | 883 | $this->file_type = 'image/jpeg'; |
888 | 884 | } |
@@ -1148,9 +1144,12 @@ discard block |
||
1148 | 1144 | |
1149 | 1145 | if (function_exists('getimagesize') && @getimagesize($file) !== FALSE) |
1150 | 1146 | { |
1151 | - if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary |
|
1147 | + if (($file = @fopen($file, 'rb')) === FALSE) { |
|
1148 | + // "b" to force binary |
|
1152 | 1149 | { |
1153 | - return FALSE; // Couldn't open the file, return FALSE |
|
1150 | + return FALSE; |
|
1151 | + } |
|
1152 | + // Couldn't open the file, return FALSE |
|
1154 | 1153 | } |
1155 | 1154 | |
1156 | 1155 | $opening_bytes = fread($file, 256); |
@@ -1269,9 +1268,11 @@ discard block |
||
1269 | 1268 | if (function_exists('finfo_file')) |
1270 | 1269 | { |
1271 | 1270 | $finfo = @finfo_open(FILEINFO_MIME); |
1272 | - if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system |
|
1271 | + if (is_resource($finfo)) { |
|
1272 | + // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system |
|
1273 | 1273 | { |
1274 | 1274 | $mime = @finfo_file($finfo, $file['tmp_name']); |
1275 | + } |
|
1275 | 1276 | finfo_close($finfo); |
1276 | 1277 | |
1277 | 1278 | /* According to the comments section of the PHP manual page, |
@@ -1356,10 +1357,12 @@ discard block |
||
1356 | 1357 | if (function_exists('mime_content_type')) |
1357 | 1358 | { |
1358 | 1359 | $this->file_type = @mime_content_type($file['tmp_name']); |
1359 | - if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string |
|
1360 | + if (strlen($this->file_type) > 0) { |
|
1361 | + // It's possible that mime_content_type() returns FALSE or an empty string |
|
1360 | 1362 | { |
1361 | 1363 | return; |
1362 | 1364 | } |
1365 | + } |
|
1363 | 1366 | } |
1364 | 1367 | |
1365 | 1368 | $this->file_type = $file['type']; |
@@ -11,7 +11,6 @@ |
||
11 | 11 | namespace Kenjis\MonkeyPatch; |
12 | 12 | |
13 | 13 | use LogicException; |
14 | -use RuntimeException; |
|
15 | 14 | use PhpParser\ParserFactory; |
16 | 15 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
17 | 16 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | public static function log($message) |
43 | 43 | { |
44 | - if (! self::$debug) |
|
44 | + if ( ! self::$debug) |
|
45 | 45 | { |
46 | 46 | return; |
47 | 47 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } |
81 | 81 | if (is_null(self::$log_file)) |
82 | 82 | { |
83 | - self::$log_file = __DIR__ . '/debug.log'; |
|
83 | + self::$log_file = __DIR__.'/debug.log'; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | else |
94 | 94 | { |
95 | 95 | // APPPATH is constant in CodeIgniter |
96 | - Cache::setProjectRootDir(APPPATH . '../'); |
|
96 | + Cache::setProjectRootDir(APPPATH.'../'); |
|
97 | 97 | } |
98 | 98 | |
99 | - if (! isset($config['cache_dir'])) |
|
99 | + if ( ! isset($config['cache_dir'])) |
|
100 | 100 | { |
101 | 101 | throw new LogicException('You have to set "cache_dir"'); |
102 | 102 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | protected static function setPaths(array $config) |
107 | 107 | { |
108 | - if (! isset($config['include_paths'])) |
|
108 | + if ( ! isset($config['include_paths'])) |
|
109 | 109 | { |
110 | 110 | throw new LogicException('You have to set "include_paths"'); |
111 | 111 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | // Updated? |
167 | 167 | if ($cached !== $current) |
168 | 168 | { |
169 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
169 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
170 | 170 | Cache::clearSrcCache(); |
171 | 171 | Cache::writeTmpIncludePaths($current); |
172 | 172 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | // Updated? |
178 | 178 | if ($cached !== $current) |
179 | 179 | { |
180 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
180 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
181 | 181 | Cache::clearSrcCache(); |
182 | 182 | Cache::writeTmpExcludePaths($current); |
183 | 183 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | // Updated? |
191 | 191 | if ($cached !== self::$patcher_list) |
192 | 192 | { |
193 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
193 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
194 | 194 | Cache::clearSrcCache(); |
195 | 195 | Cache::writeTmpPatcherList(self::$patcher_list); |
196 | 196 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | // Updated? |
205 | 205 | if ($cached !== $current) |
206 | 206 | { |
207 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
207 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
208 | 208 | Cache::clearSrcCache(); |
209 | 209 | Cache::writeTmpFunctionWhitelist($current); |
210 | 210 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | */ |
267 | 267 | public static function patch($path) |
268 | 268 | { |
269 | - if (! is_readable($path)) |
|
269 | + if ( ! is_readable($path)) |
|
270 | 270 | { |
271 | 271 | throw new LogicException("Can't read '$path'"); |
272 | 272 | } |
@@ -274,17 +274,17 @@ discard block |
||
274 | 274 | // Check cache file |
275 | 275 | if ($cache_file = Cache::getValidSrcCachePath($path)) |
276 | 276 | { |
277 | - self::log('cache_hit: ' . $path); |
|
277 | + self::log('cache_hit: '.$path); |
|
278 | 278 | return fopen($cache_file, 'r'); |
279 | 279 | } |
280 | 280 | |
281 | - self::log('cache_miss: ' . $path); |
|
281 | + self::log('cache_miss: '.$path); |
|
282 | 282 | $source = file_get_contents($path); |
283 | 283 | |
284 | 284 | list($new_source, $patched) = self::execPatchers($source); |
285 | 285 | |
286 | 286 | // Write to cache file |
287 | - self::log('write_cache: ' . $path); |
|
287 | + self::log('write_cache: '.$path); |
|
288 | 288 | Cache::writeSrcCacheFile($path, $new_source); |
289 | 289 | |
290 | 290 | $resource = fopen('php://memory', 'rb+'); |
@@ -300,12 +300,12 @@ discard block |
||
300 | 300 | return; |
301 | 301 | } |
302 | 302 | |
303 | - require __DIR__ . '/Patcher/AbstractPatcher.php'; |
|
304 | - require __DIR__ . '/Patcher/Backtrace.php'; |
|
303 | + require __DIR__.'/Patcher/AbstractPatcher.php'; |
|
304 | + require __DIR__.'/Patcher/Backtrace.php'; |
|
305 | 305 | |
306 | 306 | foreach (self::$patcher_list as $classname) |
307 | 307 | { |
308 | - require __DIR__ . '/Patcher/' . $classname . '.php'; |
|
308 | + require __DIR__.'/Patcher/'.$classname.'.php'; |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | self::$load_patchers = true; |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $patched = false; |
317 | 317 | foreach (self::$patcher_list as $classname) |
318 | 318 | { |
319 | - $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname; |
|
319 | + $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname; |
|
320 | 320 | $patcher = new $classname; |
321 | 321 | list($source, $patched_this) = $patcher->patch($source); |
322 | 322 | $patched = $patched || $patched_this; |
@@ -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 . '../'); |
@@ -40,6 +40,9 @@ discard block |
||
40 | 40 | 'ConstantPatcher', |
41 | 41 | ]; |
42 | 42 | |
43 | + /** |
|
44 | + * @param string $message |
|
45 | + */ |
|
43 | 46 | public static function log($message) |
44 | 47 | { |
45 | 48 | if (! self::$debug) |
@@ -224,6 +227,9 @@ discard block |
||
224 | 227 | } |
225 | 228 | } |
226 | 229 | |
230 | + /** |
|
231 | + * @param string $patcher |
|
232 | + */ |
|
227 | 233 | public static function isEnabled($patcher) |
228 | 234 | { |
229 | 235 | return in_array($patcher, self::$patcher_list); |
@@ -316,6 +322,9 @@ discard block |
||
316 | 322 | self::$load_patchers = true; |
317 | 323 | } |
318 | 324 | |
325 | + /** |
|
326 | + * @param string $source |
|
327 | + */ |
|
319 | 328 | protected static function execPatchers($source) |
320 | 329 | { |
321 | 330 | $patched = false; |
@@ -20,6 +20,9 @@ |
||
20 | 20 | 'ConstantPatcher' => 0, |
21 | 21 | ]; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $patcher |
|
25 | + */ |
|
23 | 26 | public static function getInfo($patcher, $backtrace) |
24 | 27 | { |
25 | 28 | if (! isset(self::$map[$patcher])) |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | public static function getInfo($patcher, $backtrace) |
23 | 23 | { |
24 | - if (! isset(self::$map[$patcher])) |
|
24 | + if ( ! isset(self::$map[$patcher])) |
|
25 | 25 | { |
26 | 26 | throw new LogicException("No such a patcher: $patcher"); |
27 | 27 | } |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | $line = isset($backtrace[$offset]['line']) |
42 | 42 | ? $backtrace[$offset]['line'] : null; |
43 | 43 | |
44 | - if (isset($backtrace[$offset+2])) |
|
44 | + if (isset($backtrace[$offset + 2])) |
|
45 | 45 | { |
46 | - $class = isset($backtrace[$offset+2]['class']) |
|
47 | - ? $backtrace[$offset+2]['class'] |
|
46 | + $class = isset($backtrace[$offset + 2]['class']) |
|
47 | + ? $backtrace[$offset + 2]['class'] |
|
48 | 48 | : null; |
49 | - $function = $backtrace[$offset+2]['function']; |
|
49 | + $function = $backtrace[$offset + 2]['function']; |
|
50 | 50 | } |
51 | 51 | else |
52 | 52 | { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | if (isset($class)) |
58 | 58 | { |
59 | 59 | $method = $function; |
60 | - $class_method = $class . '::' . $function; |
|
60 | + $class_method = $class.'::'.$function; |
|
61 | 61 | $function = null; |
62 | 62 | } |
63 | 63 | else |
@@ -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; |
@@ -14,7 +14,6 @@ |
||
14 | 14 | require __DIR__ . '/ConstantPatcher/Proxy.php'; |
15 | 15 | |
16 | 16 | use LogicException; |
17 | - |
|
18 | 17 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher\NodeVisitor; |
19 | 18 | |
20 | 19 | class ConstantPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/ConstantPatcher/NodeVisitor.php'; |
|
14 | -require __DIR__ . '/ConstantPatcher/Proxy.php'; |
|
13 | +require __DIR__.'/ConstantPatcher/NodeVisitor.php'; |
|
14 | +require __DIR__.'/ConstantPatcher/Proxy.php'; |
|
15 | 15 | |
16 | 16 | use LogicException; |
17 | 17 |
@@ -72,8 +72,7 @@ discard block |
||
72 | 72 | if (is_string($token)) |
73 | 73 | { |
74 | 74 | $new_source .= $token; |
75 | - } |
|
76 | - elseif (isset($replacement['key']) && $i == $replacement['key']) |
|
75 | + } elseif (isset($replacement['key']) && $i == $replacement['key']) |
|
77 | 76 | { |
78 | 77 | $new_source .= $replacement['value']; |
79 | 78 | $replacement['key'] = key(self::$replacement); |
@@ -83,8 +82,7 @@ discard block |
||
83 | 82 | { |
84 | 83 | $replacement = false; |
85 | 84 | } |
86 | - } |
|
87 | - else |
|
85 | + } else |
|
88 | 86 | { |
89 | 87 | $new_source .= $token[1]; |
90 | 88 | } |
@@ -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 |
@@ -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 | } |
@@ -51,6 +51,9 @@ discard block |
||
51 | 51 | self::$patches_to_apply = []; |
52 | 52 | } |
53 | 53 | |
54 | + /** |
|
55 | + * @param string $constant |
|
56 | + */ |
|
54 | 57 | protected static function logInvocation($constant) |
55 | 58 | { |
56 | 59 | if (MonkeyPatchManager::$debug) |
@@ -68,6 +71,9 @@ discard block |
||
68 | 71 | } |
69 | 72 | } |
70 | 73 | |
74 | + /** |
|
75 | + * @param string $constant |
|
76 | + */ |
|
71 | 77 | protected static function checkCalledMethod($constant) |
72 | 78 | { |
73 | 79 | $trace = debug_backtrace(); |
@@ -13,14 +13,9 @@ |
||
13 | 13 | class_alias('Kenjis\MonkeyPatch\Patcher\ConstantPatcher\Proxy', '__ConstProxy__'); |
14 | 14 | |
15 | 15 | use LogicException; |
16 | -use ReflectionConstant; |
|
17 | -use ReflectionException; |
|
18 | - |
|
19 | 16 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher; |
20 | 17 | use Kenjis\MonkeyPatch\Patcher\Backtrace; |
21 | 18 | use Kenjis\MonkeyPatch\MonkeyPatchManager; |
22 | -use Kenjis\MonkeyPatch\Cache; |
|
23 | -use Kenjis\MonkeyPatch\InvocationVerifier; |
|
24 | 19 | |
25 | 20 | class Proxy |
26 | 21 | { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
64 | 64 | |
65 | 65 | MonkeyPatchManager::log( |
66 | - 'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
66 | + 'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()' |
|
67 | 67 | ); |
68 | 68 | } |
69 | 69 | } |
@@ -106,12 +106,12 @@ discard block |
||
106 | 106 | { |
107 | 107 | self::logInvocation($constant); |
108 | 108 | |
109 | - if (! empty(self::$patches_to_apply[$constant])) |
|
109 | + if ( ! empty(self::$patches_to_apply[$constant])) |
|
110 | 110 | { |
111 | - if (! self::checkCalledMethod($constant)) |
|
111 | + if ( ! self::checkCalledMethod($constant)) |
|
112 | 112 | { |
113 | 113 | MonkeyPatchManager::log( |
114 | - 'invoke_const: ' . $constant . ' not patched (out of scope)' |
|
114 | + 'invoke_const: '.$constant.' not patched (out of scope)' |
|
115 | 115 | ); |
116 | 116 | return constant($constant); |
117 | 117 | } |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | if (array_key_exists($constant, self::$patches)) |
121 | 121 | { |
122 | - MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched'); |
|
122 | + MonkeyPatchManager::log('invoke_const: '.$constant.' patched'); |
|
123 | 123 | return self::$patches[$constant]; |
124 | 124 | } |
125 | 125 | |
126 | 126 | MonkeyPatchManager::log( |
127 | - 'invoke_const: ' . $constant . ' not patched (no patch)' |
|
127 | + 'invoke_const: '.$constant.' not patched (no patch)' |
|
128 | 128 | ); |
129 | 129 | return constant($constant); |
130 | 130 | } |