@@ -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 | } |
@@ -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; |
@@ -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 . '../'); |
@@ -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 | } |
@@ -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 | } |
@@ -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; |
@@ -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 . '../'); |
@@ -327,19 +327,16 @@ discard block |
||
| 327 | 327 | if ($reflection->hasMethod('set_'.$key)) |
| 328 | 328 | { |
| 329 | 329 | $this->{'set_'.$key}($config[$key]); |
| 330 | - } |
|
| 331 | - else |
|
| 330 | + } else |
|
| 332 | 331 | { |
| 333 | 332 | $this->$key = $config[$key]; |
| 334 | 333 | } |
| 335 | - } |
|
| 336 | - else |
|
| 334 | + } else |
|
| 337 | 335 | { |
| 338 | 336 | $this->$key = $defaults[$key]; |
| 339 | 337 | } |
| 340 | 338 | } |
| 341 | - } |
|
| 342 | - else |
|
| 339 | + } else |
|
| 343 | 340 | { |
| 344 | 341 | foreach ($config as $key => &$value) |
| 345 | 342 | { |
@@ -348,8 +345,7 @@ discard block |
||
| 348 | 345 | if ($reflection->hasMethod('set_'.$key)) |
| 349 | 346 | { |
| 350 | 347 | $this->{'set_'.$key}($value); |
| 351 | - } |
|
| 352 | - else |
|
| 348 | + } else |
|
| 353 | 349 | { |
| 354 | 350 | $this->$key = $value; |
| 355 | 351 | } |
@@ -409,9 +405,11 @@ discard block |
||
| 409 | 405 | } |
| 410 | 406 | |
| 411 | 407 | // Was the file able to be uploaded? If not, determine the reason why. |
| 412 | - if ( ! file_exists($_file['tmp_name'])) // modified by ci-phpunit-test |
|
| 408 | + if ( ! file_exists($_file['tmp_name'])) { |
|
| 409 | + // modified by ci-phpunit-test |
|
| 413 | 410 | { |
| 414 | 411 | $error = isset($_file['error']) ? $_file['error'] : 4; |
| 412 | + } |
|
| 415 | 413 | |
| 416 | 414 | switch ($error) |
| 417 | 415 | { |
@@ -476,8 +474,7 @@ discard block |
||
| 476 | 474 | if (strpos($this->_file_name_override, '.') === FALSE) |
| 477 | 475 | { |
| 478 | 476 | $this->file_name .= $this->file_ext; |
| 479 | - } |
|
| 480 | - else |
|
| 477 | + } else |
|
| 481 | 478 | { |
| 482 | 479 | // An extension was provided, let's have it! |
| 483 | 480 | $this->file_ext = $this->get_extension($this->_file_name_override); |
@@ -677,8 +674,7 @@ discard block |
||
| 677 | 674 | { |
| 678 | 675 | $this->set_error('upload_bad_filename', 'debug'); |
| 679 | 676 | return FALSE; |
| 680 | - } |
|
| 681 | - else |
|
| 677 | + } else |
|
| 682 | 678 | { |
| 683 | 679 | return $new_filename; |
| 684 | 680 | } |
@@ -863,8 +859,7 @@ discard block |
||
| 863 | 859 | if (in_array($this->file_type, $png_mimes)) |
| 864 | 860 | { |
| 865 | 861 | $this->file_type = 'image/png'; |
| 866 | - } |
|
| 867 | - elseif (in_array($this->file_type, $jpeg_mimes)) |
|
| 862 | + } elseif (in_array($this->file_type, $jpeg_mimes)) |
|
| 868 | 863 | { |
| 869 | 864 | $this->file_type = 'image/jpeg'; |
| 870 | 865 | } |
@@ -1116,9 +1111,12 @@ discard block |
||
| 1116 | 1111 | |
| 1117 | 1112 | if (function_exists('getimagesize') && @getimagesize($file) !== FALSE) |
| 1118 | 1113 | { |
| 1119 | - if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary |
|
| 1114 | + if (($file = @fopen($file, 'rb')) === FALSE) { |
|
| 1115 | + // "b" to force binary |
|
| 1120 | 1116 | { |
| 1121 | - return FALSE; // Couldn't open the file, return FALSE |
|
| 1117 | + return FALSE; |
|
| 1118 | + } |
|
| 1119 | + // Couldn't open the file, return FALSE |
|
| 1122 | 1120 | } |
| 1123 | 1121 | |
| 1124 | 1122 | $opening_bytes = fread($file, 256); |
@@ -1220,9 +1218,11 @@ discard block |
||
| 1220 | 1218 | |
| 1221 | 1219 | // Fileinfo extension - most reliable method |
| 1222 | 1220 | $finfo = @finfo_open(FILEINFO_MIME); |
| 1223 | - 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 |
|
| 1221 | + if (is_resource($finfo)) { |
|
| 1222 | + // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system |
|
| 1224 | 1223 | { |
| 1225 | 1224 | $mime = @finfo_file($finfo, $file['tmp_name']); |
| 1225 | + } |
|
| 1226 | 1226 | finfo_close($finfo); |
| 1227 | 1227 | |
| 1228 | 1228 | /* According to the comments section of the PHP manual page, |
@@ -1306,10 +1306,12 @@ discard block |
||
| 1306 | 1306 | if (function_exists('mime_content_type')) |
| 1307 | 1307 | { |
| 1308 | 1308 | $this->file_type = @mime_content_type($file['tmp_name']); |
| 1309 | - if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string |
|
| 1309 | + if (strlen($this->file_type) > 0) { |
|
| 1310 | + // It's possible that mime_content_type() returns FALSE or an empty string |
|
| 1310 | 1311 | { |
| 1311 | 1312 | return; |
| 1312 | 1313 | } |
| 1314 | + } |
|
| 1313 | 1315 | } |
| 1314 | 1316 | |
| 1315 | 1317 | $this->file_type = $file['type']; |