@@ -78,12 +78,10 @@ |
||
78 | 78 | try |
79 | 79 | { |
80 | 80 | static::handleError($err['type'], $err['message'], $err['file'], $err['line']); |
81 | - } |
|
82 | - catch (\Error $ex) |
|
81 | + } catch (\Error $ex) |
|
83 | 82 | { |
84 | 83 | echo call_user_func(static::$errHandler, $ex) . PHP_EOL; |
85 | - } |
|
86 | - catch (\Exception $ex) |
|
84 | + } catch (\Exception $ex) |
|
87 | 85 | { |
88 | 86 | echo call_user_func(static::$excHandler, $ex) . PHP_EOL; |
89 | 87 | } |
@@ -44,14 +44,12 @@ |
||
44 | 44 | $this->class = get_class($throwableOrMessage); |
45 | 45 | $this->message = $throwableOrMessage->getMessage(); |
46 | 46 | $this->prev = $prev === null ? null : new ThrowableProxy($prev); |
47 | - } |
|
48 | - else if (is_array($throwableOrMessage)) |
|
47 | + } else if (is_array($throwableOrMessage)) |
|
49 | 48 | { |
50 | 49 | $this->class = $throwableOrMessage[0]; |
51 | 50 | $this->message = $throwableOrMessage[1]; |
52 | 51 | $this->prev = null; |
53 | - } |
|
54 | - else |
|
52 | + } else |
|
55 | 53 | { |
56 | 54 | $this->class = 'Exception'; |
57 | 55 | $this->message = $throwableOrMessage; |
@@ -18,8 +18,7 @@ discard block |
||
18 | 18 | { |
19 | 19 | $message = preg_replace('#([a-zA-Z0-9-_]+?)/#siU', '', $message); |
20 | 20 | $message = preg_replace('#/#si', '', $message, 1); |
21 | - } |
|
22 | - else |
|
21 | + } else |
|
23 | 22 | { |
24 | 23 | $message = trim($message, '"'); |
25 | 24 | $file = str_replace('.php', '', basename($ex['file'])); |
@@ -135,12 +134,10 @@ discard block |
||
135 | 134 | if (is_array($element)) |
136 | 135 | { |
137 | 136 | $element = 'Array'; |
138 | - } |
|
139 | - else if (is_object($element)) |
|
137 | + } else if (is_object($element)) |
|
140 | 138 | { |
141 | 139 | $element = get_class($element); |
142 | - } |
|
143 | - else if (is_string($element)) |
|
140 | + } else if (is_string($element)) |
|
144 | 141 | { |
145 | 142 | $element = (strlen($element) > 32) ? substr($element, 0, 32) . '...' : $element; |
146 | 143 | $element = '"' . $element . '"'; |