@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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']; |
@@ -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 | } |
@@ -44,8 +44,7 @@ discard block |
||
| 44 | 44 | APPPATH.'modules', |
| 45 | 45 | APPPATH.'hooks', |
| 46 | 46 | ]; |
| 47 | - } |
|
| 48 | - else |
|
| 47 | + } else |
|
| 49 | 48 | { |
| 50 | 49 | $this->dirs = $dirs; |
| 51 | 50 | } |
@@ -86,8 +85,7 @@ discard block |
||
| 86 | 85 | { |
| 87 | 86 | $dir = __DIR__; |
| 88 | 87 | $this->loadClassFile($dir, $class); |
| 89 | - } |
|
| 90 | - else |
|
| 88 | + } else |
|
| 91 | 89 | { |
| 92 | 90 | $dir = __DIR__ . '/exceptions'; |
| 93 | 91 | $this->loadClassFile($dir, $class); |
@@ -152,8 +150,7 @@ discard block |
||
| 152 | 150 | { |
| 153 | 151 | require $filename; |
| 154 | 152 | return true; |
| 155 | - } |
|
| 156 | - else |
|
| 153 | + } else |
|
| 157 | 154 | { |
| 158 | 155 | unset($this->cache[$class]); |
| 159 | 156 | } |
@@ -85,8 +85,7 @@ discard block |
||
| 85 | 85 | if (! self::wiredesignzHmvcInstalled()) |
| 86 | 86 | { |
| 87 | 87 | new CI_Controller(); |
| 88 | - } |
|
| 89 | - else |
|
| 88 | + } else |
|
| 90 | 89 | { |
| 91 | 90 | new MX_Controller(); |
| 92 | 91 | } |
@@ -106,8 +105,7 @@ discard block |
||
| 106 | 105 | if (! self::wiredesignzHmvcInstalled()) |
| 107 | 106 | { |
| 108 | 107 | new CI_Controller(); |
| 109 | - } |
|
| 110 | - else |
|
| 108 | + } else |
|
| 111 | 109 | { |
| 112 | 110 | new CI(); |
| 113 | 111 | new MX_Controller(); |
@@ -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 | } |