@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | { |
| 36 | 36 | if ($this->db === null) |
| 37 | 37 | { |
| 38 | - $CI =& get_instance(); |
|
| 38 | + $CI = & get_instance(); |
|
| 39 | 39 | $CI->load->database(); |
| 40 | 40 | $this->db = $CI->db; |
| 41 | 41 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | protected function tearDown() |
| 56 | 56 | { |
| 57 | - if (! empty($this->insertCache)) |
|
| 57 | + if ( ! empty($this->insertCache)) |
|
| 58 | 58 | { |
| 59 | 59 | foreach ($this->insertCache as $row) |
| 60 | 60 | { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function __construct() |
| 19 | 19 | { |
| 20 | - $this->CI =& get_instance(); |
|
| 20 | + $this->CI = & get_instance(); |
|
| 21 | 21 | $this->CI->load->database(); |
| 22 | 22 | $this->CI->load->dbforge(); |
| 23 | 23 | $this->db = $this->CI->db; |
@@ -33,10 +33,10 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | if ($this->seedPath === null) |
| 35 | 35 | { |
| 36 | - $this->seedPath = APPPATH . 'database/seeds/'; |
|
| 36 | + $this->seedPath = APPPATH.'database/seeds/'; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - $file = $this->seedPath . $seeder . '.php'; |
|
| 39 | + $file = $this->seedPath.$seeder.'.php'; |
|
| 40 | 40 | require_once $file; |
| 41 | 41 | |
| 42 | 42 | $obj = new $seeder; |
@@ -48,8 +48,7 @@ |
||
| 48 | 48 | if ($constructor_params === false) |
| 49 | 49 | { |
| 50 | 50 | $mock->disableOriginalConstructor(); |
| 51 | - } |
|
| 52 | - elseif (is_array($constructor_params)) |
|
| 51 | + } elseif (is_array($constructor_params)) |
|
| 53 | 52 | { |
| 54 | 53 | $mock->setConstructorArgs($constructor_params); |
| 55 | 54 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * |
| 33 | 33 | * @param string $classname |
| 34 | 34 | * @param array $params [method_name => return_value] |
| 35 | - * @param mixed $constructor_params false: disable construntor, array: construntor params |
|
| 35 | + * @param boolean $constructor_params false: disable construntor, array: construntor params |
|
| 36 | 36 | * |
| 37 | 37 | * @return object PHPUnit mock object |
| 38 | 38 | */ |
@@ -72,6 +72,10 @@ discard block |
||
| 72 | 72 | return $mock; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | + /** |
|
| 76 | + * @param string $method |
|
| 77 | + * @param string $with |
|
| 78 | + */ |
|
| 75 | 79 | protected function _verify($mock, $method, $params = null, $expects, $with) |
| 76 | 80 | { |
| 77 | 81 | $invocation = $mock->expects($expects) |
@@ -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 | } |
@@ -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'); |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // Handle single file |
| 45 | - $file =& $files[$field]; |
|
| 45 | + $file = & $files[$field]; |
|
| 46 | 46 | |
| 47 | - if (! file_exists($file['tmp_name'])) |
|
| 47 | + if ( ! file_exists($file['tmp_name'])) |
|
| 48 | 48 | { |
| 49 | 49 | $file['error'] = UPLOAD_ERR_NO_FILE; |
| 50 | 50 | $file['type'] = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | // Set $_GET if URI string has query string |
| 111 | 111 | parse_str($query_string, $_GET); |
| 112 | 112 | // Remove query string from URI string |
| 113 | - $argv = substr($argv, 0, -strlen($query_string)-1); |
|
| 113 | + $argv = substr($argv, 0, -strlen($query_string) - 1); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | if ($_GET !== []) |
| 144 | 144 | { |
| 145 | 145 | $_SERVER['REQUEST_URI'] = |
| 146 | - '/' . $path . '?' |
|
| 146 | + '/'.$path.'?' |
|
| 147 | 147 | . http_build_query($_GET); |
| 148 | 148 | } |
| 149 | 149 | else |
| 150 | 150 | { |
| 151 | - $_SERVER['REQUEST_URI'] = '/' . $path; |
|
| 151 | + $_SERVER['REQUEST_URI'] = '/'.$path; |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | if ($query_string === false) |
| 167 | 167 | { |
| 168 | - throw new LogicException('Bad URI string: ' . $uri); |
|
| 168 | + throw new LogicException('Bad URI string: '.$uri); |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | return $query_string; |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | else |
| 192 | 192 | { |
| 193 | - $key = 'HTTP_' . $normalized_name; |
|
| 193 | + $key = 'HTTP_'.$normalized_name; |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | $_SERVER[$key] = $value; |
@@ -76,8 +76,7 @@ discard block |
||
| 76 | 76 | if (is_numeric($value)) |
| 77 | 77 | { |
| 78 | 78 | return $value; |
| 79 | - } |
|
| 80 | - else |
|
| 79 | + } else |
|
| 81 | 80 | { |
| 82 | 81 | $value_length = strlen($value); |
| 83 | 82 | $number = substr($value, 0, $value_length - 1); |
@@ -133,8 +132,7 @@ discard block |
||
| 133 | 132 | if (is_string($argv)) |
| 134 | 133 | { |
| 135 | 134 | $path = $argv; |
| 136 | - } |
|
| 137 | - elseif (is_array($argv)) |
|
| 135 | + } elseif (is_array($argv)) |
|
| 138 | 136 | { |
| 139 | 137 | // Generate URI path from array of controller, method, arg, ... |
| 140 | 138 | $path = implode('/', $argv); |
@@ -145,8 +143,7 @@ discard block |
||
| 145 | 143 | $_SERVER['REQUEST_URI'] = |
| 146 | 144 | '/' . $path . '?' |
| 147 | 145 | . http_build_query($_GET); |
| 148 | - } |
|
| 149 | - else |
|
| 146 | + } else |
|
| 150 | 147 | { |
| 151 | 148 | $_SERVER['REQUEST_URI'] = '/' . $path; |
| 152 | 149 | } |
@@ -187,8 +184,7 @@ discard block |
||
| 187 | 184 | ) |
| 188 | 185 | { |
| 189 | 186 | $key = $normalized_name; |
| 190 | - } |
|
| 191 | - else |
|
| 187 | + } else |
|
| 192 | 188 | { |
| 193 | 189 | $key = 'HTTP_' . $normalized_name; |
| 194 | 190 | } |
@@ -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); |
@@ -687,8 +684,7 @@ discard block |
||
| 687 | 684 | { |
| 688 | 685 | $this->set_error('upload_bad_filename', 'debug'); |
| 689 | 686 | return FALSE; |
| 690 | - } |
|
| 691 | - else |
|
| 687 | + } else |
|
| 692 | 688 | { |
| 693 | 689 | return $new_filename; |
| 694 | 690 | } |
@@ -883,8 +879,7 @@ discard block |
||
| 883 | 879 | if (in_array($this->file_type, $png_mimes)) |
| 884 | 880 | { |
| 885 | 881 | $this->file_type = 'image/png'; |
| 886 | - } |
|
| 887 | - elseif (in_array($this->file_type, $jpeg_mimes)) |
|
| 882 | + } elseif (in_array($this->file_type, $jpeg_mimes)) |
|
| 888 | 883 | { |
| 889 | 884 | $this->file_type = 'image/jpeg'; |
| 890 | 885 | } |
@@ -1150,9 +1145,12 @@ discard block |
||
| 1150 | 1145 | |
| 1151 | 1146 | if (function_exists('getimagesize') && @getimagesize($file) !== FALSE) |
| 1152 | 1147 | { |
| 1153 | - if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary |
|
| 1148 | + if (($file = @fopen($file, 'rb')) === FALSE) { |
|
| 1149 | + // "b" to force binary |
|
| 1154 | 1150 | { |
| 1155 | - return FALSE; // Couldn't open the file, return FALSE |
|
| 1151 | + return FALSE; |
|
| 1152 | + } |
|
| 1153 | + // Couldn't open the file, return FALSE |
|
| 1156 | 1154 | } |
| 1157 | 1155 | |
| 1158 | 1156 | $opening_bytes = fread($file, 256); |
@@ -1271,9 +1269,11 @@ discard block |
||
| 1271 | 1269 | if (function_exists('finfo_file')) |
| 1272 | 1270 | { |
| 1273 | 1271 | $finfo = @finfo_open(FILEINFO_MIME); |
| 1274 | - 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 |
|
| 1272 | + if (is_resource($finfo)) { |
|
| 1273 | + // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system |
|
| 1275 | 1274 | { |
| 1276 | 1275 | $mime = @finfo_file($finfo, $file['tmp_name']); |
| 1276 | + } |
|
| 1277 | 1277 | finfo_close($finfo); |
| 1278 | 1278 | |
| 1279 | 1279 | /* According to the comments section of the PHP manual page, |
@@ -1358,10 +1358,12 @@ discard block |
||
| 1358 | 1358 | if (function_exists('mime_content_type')) |
| 1359 | 1359 | { |
| 1360 | 1360 | $this->file_type = @mime_content_type($file['tmp_name']); |
| 1361 | - if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string |
|
| 1361 | + if (strlen($this->file_type) > 0) { |
|
| 1362 | + // It's possible that mime_content_type() returns FALSE or an empty string |
|
| 1362 | 1363 | { |
| 1363 | 1364 | return; |
| 1364 | 1365 | } |
| 1366 | + } |
|
| 1365 | 1367 | } |
| 1366 | 1368 | |
| 1367 | 1369 | $this->file_type = $file['type']; |
@@ -35,6 +35,9 @@ discard block |
||
| 35 | 35 | 'ConstantPatcher', |
| 36 | 36 | ]; |
| 37 | 37 | |
| 38 | + /** |
|
| 39 | + * @param string $message |
|
| 40 | + */ |
|
| 38 | 41 | public static function log($message) |
| 39 | 42 | { |
| 40 | 43 | if (! self::$debug) |
@@ -303,6 +306,9 @@ discard block |
||
| 303 | 306 | self::$load_patchers = true; |
| 304 | 307 | } |
| 305 | 308 | |
| 309 | + /** |
|
| 310 | + * @param string $source |
|
| 311 | + */ |
|
| 306 | 312 | protected static function execPatchers($source) |
| 307 | 313 | { |
| 308 | 314 | $patched = false; |
@@ -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 | |
@@ -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 . '../'); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public static function log($message) |
| 39 | 39 | { |
| 40 | - if (! self::$debug) |
|
| 40 | + if ( ! self::$debug) |
|
| 41 | 41 | { |
| 42 | 42 | return; |
| 43 | 43 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | if (self::$debug) |
| 74 | 74 | { |
| 75 | - self::$log_file = __DIR__ . '/debug.log'; |
|
| 75 | + self::$log_file = __DIR__.'/debug.log'; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | else |
| 86 | 86 | { |
| 87 | 87 | // APPPATH is constant in CodeIgniter |
| 88 | - Cache::setProjectRootDir(APPPATH . '../'); |
|
| 88 | + Cache::setProjectRootDir(APPPATH.'../'); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if (! isset($config['cache_dir'])) |
|
| 91 | + if ( ! isset($config['cache_dir'])) |
|
| 92 | 92 | { |
| 93 | 93 | throw new LogicException('You have to set "cache_dir"'); |
| 94 | 94 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | protected static function setPaths(array $config) |
| 99 | 99 | { |
| 100 | - if (! isset($config['include_paths'])) |
|
| 100 | + if ( ! isset($config['include_paths'])) |
|
| 101 | 101 | { |
| 102 | 102 | throw new LogicException('You have to set "include_paths"'); |
| 103 | 103 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | // Updated? |
| 159 | 159 | if ($cached !== $current) |
| 160 | 160 | { |
| 161 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 161 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 162 | 162 | Cache::clearSrcCache(); |
| 163 | 163 | Cache::writeTmpIncludePaths($current); |
| 164 | 164 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | // Updated? |
| 170 | 170 | if ($cached !== $current) |
| 171 | 171 | { |
| 172 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 172 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 173 | 173 | Cache::clearSrcCache(); |
| 174 | 174 | Cache::writeTmpExcludePaths($current); |
| 175 | 175 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | // Updated? |
| 183 | 183 | if ($cached !== self::$patcher_list) |
| 184 | 184 | { |
| 185 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 185 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 186 | 186 | Cache::clearSrcCache(); |
| 187 | 187 | Cache::writeTmpPatcherList(self::$patcher_list); |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | // Updated? |
| 197 | 197 | if ($cached !== $current) |
| 198 | 198 | { |
| 199 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 199 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 200 | 200 | Cache::clearSrcCache(); |
| 201 | 201 | Cache::writeTmpFunctionWhitelist($current); |
| 202 | 202 | } |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | public static function patch($path) |
| 260 | 260 | { |
| 261 | - if (! is_readable($path)) |
|
| 261 | + if ( ! is_readable($path)) |
|
| 262 | 262 | { |
| 263 | 263 | throw new LogicException("Can't read '$path'"); |
| 264 | 264 | } |
@@ -266,17 +266,17 @@ discard block |
||
| 266 | 266 | // Check cache file |
| 267 | 267 | if ($cache_file = Cache::getValidSrcCachePath($path)) |
| 268 | 268 | { |
| 269 | - self::log('cache_hit: ' . $path); |
|
| 269 | + self::log('cache_hit: '.$path); |
|
| 270 | 270 | return fopen($cache_file, 'r'); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - self::log('cache_miss: ' . $path); |
|
| 273 | + self::log('cache_miss: '.$path); |
|
| 274 | 274 | $source = file_get_contents($path); |
| 275 | 275 | |
| 276 | 276 | list($new_source, $patched) = self::execPatchers($source); |
| 277 | 277 | |
| 278 | 278 | // Write to cache file |
| 279 | - self::log('write_cache: ' . $path); |
|
| 279 | + self::log('write_cache: '.$path); |
|
| 280 | 280 | Cache::writeSrcCacheFile($path, $new_source); |
| 281 | 281 | |
| 282 | 282 | $resource = fopen('php://memory', 'rb+'); |
@@ -292,12 +292,12 @@ discard block |
||
| 292 | 292 | return; |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - require __DIR__ . '/Patcher/AbstractPatcher.php'; |
|
| 296 | - require __DIR__ . '/Patcher/Backtrace.php'; |
|
| 295 | + require __DIR__.'/Patcher/AbstractPatcher.php'; |
|
| 296 | + require __DIR__.'/Patcher/Backtrace.php'; |
|
| 297 | 297 | |
| 298 | 298 | foreach (self::$patcher_list as $classname) |
| 299 | 299 | { |
| 300 | - require __DIR__ . '/Patcher/' . $classname . '.php'; |
|
| 300 | + require __DIR__.'/Patcher/'.$classname.'.php'; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | self::$load_patchers = true; |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | $patched = false; |
| 309 | 309 | foreach (self::$patcher_list as $classname) |
| 310 | 310 | { |
| 311 | - $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname; |
|
| 311 | + $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname; |
|
| 312 | 312 | $patcher = new $classname; |
| 313 | 313 | list($source, $patched_this) = $patcher->patch($source); |
| 314 | 314 | $patched = $patched || $patched_this; |
@@ -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,26 +47,26 @@ 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 | 62 | $replacement = new FullyQualified(array()); |
| 63 | 63 | $replacement->set( |
| 64 | - '\__ConstProxy__::get(\'' . (string) $node->name . '\')' |
|
| 64 | + '\__ConstProxy__::get(\''.(string) $node->name.'\')' |
|
| 65 | 65 | ); |
| 66 | 66 | |
| 67 | 67 | $pos = $node->getAttribute('startTokenPos'); |
| 68 | 68 | ConstantPatcher::$replacement[$pos] = |
| 69 | - '\__ConstProxy__::get(\'' . (string) $node->name .'\')'; |
|
| 69 | + '\__ConstProxy__::get(\''.(string) $node->name.'\')'; |
|
| 70 | 70 | |
| 71 | 71 | $node->name = $replacement; |
| 72 | 72 | } |
@@ -21,15 +21,11 @@ |
||
| 21 | 21 | |
| 22 | 22 | namespace Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
| 23 | 23 | |
| 24 | -use ReflectionFunction; |
|
| 25 | -use ReflectionException; |
|
| 26 | - |
|
| 27 | 24 | use PhpParser\Node; |
| 28 | 25 | use PhpParser\Node\Expr\FuncCall; |
| 29 | 26 | use PhpParser\Node\Name; |
| 30 | 27 | use PhpParser\Node\Name\FullyQualified; |
| 31 | 28 | use PhpParser\NodeVisitorAbstract; |
| 32 | - |
|
| 33 | 29 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
| 34 | 30 | |
| 35 | 31 | class NodeVisitor extends NodeVisitorAbstract |
@@ -36,17 +36,17 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | public function leaveNode(Node $node) |
| 38 | 38 | { |
| 39 | - if (! ($node instanceof FuncCall)) |
|
| 39 | + if ( ! ($node instanceof FuncCall)) |
|
| 40 | 40 | { |
| 41 | 41 | return; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - if (! ($node->name instanceof Name)) |
|
| 44 | + if ( ! ($node->name instanceof Name)) |
|
| 45 | 45 | { |
| 46 | 46 | return; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if (! $node->name->isUnqualified()) |
|
| 49 | + if ( ! $node->name->isUnqualified()) |
|
| 50 | 50 | { |
| 51 | 51 | return; |
| 52 | 52 | } |
@@ -57,12 +57,12 @@ discard block |
||
| 57 | 57 | ) { |
| 58 | 58 | $replacement = new FullyQualified(array()); |
| 59 | 59 | $replacement->set( |
| 60 | - '\__FuncProxy__::' . (string) $node->name |
|
| 60 | + '\__FuncProxy__::'.(string) $node->name |
|
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | 63 | $pos = $node->getAttribute('startTokenPos'); |
| 64 | 64 | FunctionPatcher::$replacement[$pos] = |
| 65 | - '\__FuncProxy__::' . (string) $node->name; |
|
| 65 | + '\__FuncProxy__::'.(string) $node->name; |
|
| 66 | 66 | |
| 67 | 67 | $node->name = $replacement; |
| 68 | 68 | } |