@@ -215,20 +215,15 @@ discard block |
||
| 215 | 215 | //the default value is NONE, so means no need test for NONE |
| 216 | 216 | if($level == 'fatal'){ |
| 217 | 217 | $value = self::FATAL; |
| 218 | - } |
|
| 219 | - else if($level == 'error'){ |
|
| 218 | + } else if($level == 'error'){ |
|
| 220 | 219 | $value = self::ERROR; |
| 221 | - } |
|
| 222 | - else if($level == 'warning' || $level == 'warn'){ |
|
| 220 | + } else if($level == 'warning' || $level == 'warn'){ |
|
| 223 | 221 | $value = self::WARNING; |
| 224 | - } |
|
| 225 | - else if($level == 'info'){ |
|
| 222 | + } else if($level == 'info'){ |
|
| 226 | 223 | $value = self::INFO; |
| 227 | - } |
|
| 228 | - else if($level == 'debug'){ |
|
| 224 | + } else if($level == 'debug'){ |
|
| 229 | 225 | $value = self::DEBUG; |
| 230 | - } |
|
| 231 | - else if($level == 'all'){ |
|
| 226 | + } else if($level == 'all'){ |
|
| 232 | 227 | $value = self::ALL; |
| 233 | 228 | } |
| 234 | 229 | return $value; |
@@ -245,17 +240,13 @@ discard block |
||
| 245 | 240 | //the default value is NONE, so means no need test for NONE |
| 246 | 241 | if($level == self::FATAL){ |
| 247 | 242 | $value = 'FATAL'; |
| 248 | - } |
|
| 249 | - else if($level == self::ERROR){ |
|
| 243 | + } else if($level == self::ERROR){ |
|
| 250 | 244 | $value = 'ERROR'; |
| 251 | - } |
|
| 252 | - else if($level == self::WARNING){ |
|
| 245 | + } else if($level == self::WARNING){ |
|
| 253 | 246 | $value = 'WARNING'; |
| 254 | - } |
|
| 255 | - else if($level == self::INFO){ |
|
| 247 | + } else if($level == self::INFO){ |
|
| 256 | 248 | $value = 'INFO'; |
| 257 | - } |
|
| 258 | - else if($level == self::DEBUG){ |
|
| 249 | + } else if($level == self::DEBUG){ |
|
| 259 | 250 | $value = 'DEBUG'; |
| 260 | 251 | } |
| 261 | 252 | //no need for ALL |
@@ -62,8 +62,7 @@ |
||
| 62 | 62 | $query[0] = rtrim($query[0], '/'); |
| 63 | 63 | $query[0] .= $suffix; |
| 64 | 64 | $path = implode('?', $query); |
| 65 | - } |
|
| 66 | - else{ |
|
| 65 | + } else{ |
|
| 67 | 66 | $path .= $suffix; |
| 68 | 67 | } |
| 69 | 68 | } |
@@ -128,8 +128,7 @@ discard block |
||
| 128 | 128 | $logger->info('Delete config item ['.$item.']'); |
| 129 | 129 | unset(self::$config[$item]); |
| 130 | 130 | return true; |
| 131 | - } |
|
| 132 | - else{ |
|
| 131 | + } else{ |
|
| 133 | 132 | $logger->warning('Config item ['.$item.'] to be deleted does not exists'); |
| 134 | 133 | return false; |
| 135 | 134 | } |
@@ -166,8 +165,7 @@ discard block |
||
| 166 | 165 | $port = ((($serverPort != '80' && ! is_https()) || ($serverPort != '443' && is_https())) ? ':' . $serverPort : ''); |
| 167 | 166 | $baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port |
| 168 | 167 | . substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))); |
| 169 | - } |
|
| 170 | - else{ |
|
| 168 | + } else{ |
|
| 171 | 169 | $logger->warning('Can not determine the application base URL automatically, use http://localhost as default'); |
| 172 | 170 | $baseUrl = 'http://localhost/'; |
| 173 | 171 | } |