@@ -69,28 +69,28 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | switch (ENVIRONMENT) |
| 71 | 71 | { |
| 72 | - case 'testing': |
|
| 73 | - case 'development': |
|
| 74 | - error_reporting(-1); |
|
| 75 | - ini_set('display_errors', 1); |
|
| 76 | - break; |
|
| 77 | - |
|
| 78 | - case 'production': |
|
| 79 | - ini_set('display_errors', 0); |
|
| 80 | - if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | - { |
|
| 82 | - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | - } |
|
| 84 | - else |
|
| 85 | - { |
|
| 86 | - error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | - } |
|
| 88 | - break; |
|
| 89 | - |
|
| 90 | - default: |
|
| 91 | - header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | - echo 'The application environment is not set correctly.'; |
|
| 93 | - exit(1); // EXIT_ERROR |
|
| 72 | + case 'testing': |
|
| 73 | + case 'development': |
|
| 74 | + error_reporting(-1); |
|
| 75 | + ini_set('display_errors', 1); |
|
| 76 | + break; |
|
| 77 | + |
|
| 78 | + case 'production': |
|
| 79 | + ini_set('display_errors', 0); |
|
| 80 | + if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | + { |
|
| 82 | + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | + } |
|
| 84 | + else |
|
| 85 | + { |
|
| 86 | + error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | + } |
|
| 88 | + break; |
|
| 89 | + |
|
| 90 | + default: |
|
| 91 | + header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | + echo 'The application environment is not set correctly.'; |
|
| 93 | + exit(1); // EXIT_ERROR |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /* |
@@ -80,8 +80,7 @@ discard block |
||
| 80 | 80 | if (version_compare(PHP_VERSION, '5.3', '>=')) |
| 81 | 81 | { |
| 82 | 82 | error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
| 83 | - } |
|
| 84 | - else |
|
| 83 | + } else |
|
| 85 | 84 | { |
| 86 | 85 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
| 87 | 86 | } |
@@ -203,8 +202,7 @@ discard block |
||
| 203 | 202 | if (($_temp = realpath($system_path)) !== FALSE) |
| 204 | 203 | { |
| 205 | 204 | $system_path = $_temp.'/'; |
| 206 | - } |
|
| 207 | - else |
|
| 205 | + } else |
|
| 208 | 206 | { |
| 209 | 207 | // Ensure there's a trailing slash |
| 210 | 208 | $system_path = rtrim($system_path, '/').'/'; |
@@ -244,8 +242,7 @@ discard block |
||
| 244 | 242 | } |
| 245 | 243 | |
| 246 | 244 | define('APPPATH', $application_folder.DIRECTORY_SEPARATOR); |
| 247 | - } |
|
| 248 | - else |
|
| 245 | + } else |
|
| 249 | 246 | { |
| 250 | 247 | if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
| 251 | 248 | { |
@@ -263,14 +260,12 @@ discard block |
||
| 263 | 260 | if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
| 264 | 261 | { |
| 265 | 262 | $view_folder = APPPATH.$view_folder; |
| 266 | - } |
|
| 267 | - elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) |
|
| 263 | + } elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) |
|
| 268 | 264 | { |
| 269 | 265 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
| 270 | 266 | echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
| 271 | 267 | exit(3); // EXIT_CONFIG |
| 272 | - } |
|
| 273 | - else |
|
| 268 | + } else |
|
| 274 | 269 | { |
| 275 | 270 | $view_folder = APPPATH.'views'; |
| 276 | 271 | } |
@@ -279,8 +274,7 @@ discard block |
||
| 279 | 274 | if (($_temp = realpath($view_folder)) !== FALSE) |
| 280 | 275 | { |
| 281 | 276 | $view_folder = $_temp.DIRECTORY_SEPARATOR; |
| 282 | - } |
|
| 283 | - else |
|
| 277 | + } else |
|
| 284 | 278 | { |
| 285 | 279 | $view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR; |
| 286 | 280 | } |
@@ -43,8 +43,7 @@ discard block |
||
| 43 | 43 | APPPATH.'controllers', |
| 44 | 44 | APPPATH.'modules', |
| 45 | 45 | ]; |
| 46 | - } |
|
| 47 | - else |
|
| 46 | + } else |
|
| 48 | 47 | { |
| 49 | 48 | $this->dirs = $dirs; |
| 50 | 49 | } |
@@ -85,8 +84,7 @@ discard block |
||
| 85 | 84 | { |
| 86 | 85 | $dir = __DIR__; |
| 87 | 86 | $this->loadClassFile($dir, $class); |
| 88 | - } |
|
| 89 | - else |
|
| 87 | + } else |
|
| 90 | 88 | { |
| 91 | 89 | $dir = __DIR__ . '/exceptions'; |
| 92 | 90 | $this->loadClassFile($dir, $class); |
@@ -151,8 +149,7 @@ discard block |
||
| 151 | 149 | { |
| 152 | 150 | require $filename; |
| 153 | 151 | return true; |
| 154 | - } |
|
| 155 | - else |
|
| 152 | + } else |
|
| 156 | 153 | { |
| 157 | 154 | unset($this->cache[$class]); |
| 158 | 155 | } |
@@ -129,8 +129,7 @@ discard block |
||
| 129 | 129 | return $this->callControllerMethod( |
| 130 | 130 | $http_method, $argv, $params |
| 131 | 131 | ); |
| 132 | - } |
|
| 133 | - else |
|
| 132 | + } else |
|
| 134 | 133 | { |
| 135 | 134 | return $this->requestUri($http_method, $argv, $params); |
| 136 | 135 | } |
@@ -141,8 +140,7 @@ discard block |
||
| 141 | 140 | if ($e->getCode() === 0) |
| 142 | 141 | { |
| 143 | 142 | set_status_header(200); |
| 144 | - } |
|
| 145 | - else |
|
| 143 | + } else |
|
| 146 | 144 | { |
| 147 | 145 | set_status_header($e->getCode()); |
| 148 | 146 | } |
@@ -29,16 +29,14 @@ |
||
| 29 | 29 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
| 30 | 30 | { |
| 31 | 31 | $e404 = TRUE; |
| 32 | - } |
|
| 33 | - else |
|
| 32 | + } else |
|
| 34 | 33 | { |
| 35 | 34 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
| 36 | 35 | |
| 37 | 36 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
| 38 | 37 | { |
| 39 | 38 | $e404 = TRUE; |
| 40 | - } |
|
| 41 | - elseif (method_exists($class, '_remap')) |
|
| 39 | + } elseif (method_exists($class, '_remap')) |
|
| 42 | 40 | { |
| 43 | 41 | $params = array($method, array_slice($URI->rsegments, 2)); |
| 44 | 42 | $method = '_remap'; |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | if (is_string($argv)) |
| 55 | 55 | { |
| 56 | 56 | $path = $argv; |
| 57 | - } |
|
| 58 | - elseif (is_array($argv)) |
|
| 57 | + } elseif (is_array($argv)) |
|
| 59 | 58 | { |
| 60 | 59 | // Generate URI path from array of controller, method, arg, ... |
| 61 | 60 | $path = implode('/', $argv); |
@@ -66,8 +65,7 @@ discard block |
||
| 66 | 65 | $_SERVER['REQUEST_URI'] = |
| 67 | 66 | '/' . $path . '?' |
| 68 | 67 | . http_build_query($_GET); |
| 69 | - } |
|
| 70 | - else |
|
| 68 | + } else |
|
| 71 | 69 | { |
| 72 | 70 | $_SERVER['REQUEST_URI'] = '/' . $path; |
| 73 | 71 | } |
@@ -108,8 +106,7 @@ discard block |
||
| 108 | 106 | ) |
| 109 | 107 | { |
| 110 | 108 | $key = $normalized_name; |
| 111 | - } |
|
| 112 | - else |
|
| 109 | + } else |
|
| 113 | 110 | { |
| 114 | 111 | $key = 'HTTP_' . $normalized_name; |
| 115 | 112 | } |
@@ -31,12 +31,10 @@ discard block |
||
| 31 | 31 | if ($invoked === false) |
| 32 | 32 | { |
| 33 | 33 | $actual_times = 0; |
| 34 | - } |
|
| 35 | - elseif ($expected_params === null) |
|
| 34 | + } elseif ($expected_params === null) |
|
| 36 | 35 | { |
| 37 | 36 | $actual_times = count($invocations[$class_method]); |
| 38 | - } |
|
| 39 | - else |
|
| 37 | + } else |
|
| 40 | 38 | { |
| 41 | 39 | $count = 0; |
| 42 | 40 | foreach ($invocations[$class_method] as $actual_params) |
@@ -56,16 +54,14 @@ discard block |
||
| 56 | 54 | $actual_times, |
| 57 | 55 | $class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.' |
| 58 | 56 | ); |
| 59 | - } |
|
| 60 | - elseif ($expected_times === '+') |
|
| 57 | + } elseif ($expected_times === '+') |
|
| 61 | 58 | { |
| 62 | 59 | PHPUnit_Framework_TestCase::assertGreaterThanOrEqual( |
| 63 | 60 | 1, |
| 64 | 61 | $actual_times, |
| 65 | 62 | $class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.' |
| 66 | 63 | ); |
| 67 | - } |
|
| 68 | - else |
|
| 64 | + } else |
|
| 69 | 65 | { |
| 70 | 66 | PHPUnit_Framework_TestCase::assertEquals( |
| 71 | 67 | $expected_times, |
@@ -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 | } |
@@ -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; |
@@ -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 | } |