@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: yunwuxin <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\exception; |
14 | 14 | |
@@ -72,12 +72,12 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | if ($this->app->config->get('log.record_trace')) { |
75 | - $log .= PHP_EOL . $exception->getTraceAsString(); |
|
75 | + $log .= PHP_EOL.$exception->getTraceAsString(); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | try { |
79 | 79 | $this->app->log->record($log, 'error'); |
80 | - } catch (Exception $e){} |
|
80 | + } catch (Exception $e) {} |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | ob_start(); |
224 | 224 | $data = $this->convertExceptionToArray($exception); |
225 | 225 | extract($data); |
226 | - include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl'; |
|
226 | + include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl'; |
|
227 | 227 | |
228 | 228 | return ob_get_clean(); |
229 | 229 | } |
@@ -265,10 +265,10 @@ discard block |
||
265 | 265 | |
266 | 266 | if (strpos($message, ':')) { |
267 | 267 | $name = strstr($message, ':', true); |
268 | - $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message; |
|
268 | + $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message; |
|
269 | 269 | } elseif (strpos($message, ',')) { |
270 | 270 | $name = strstr($message, ',', true); |
271 | - $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message; |
|
271 | + $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message; |
|
272 | 272 | } elseif ($lang->has($message)) { |
273 | 273 | $message = $lang->get($message); |
274 | 274 | } |