@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | $context['class'] = get_class($throwable); |
56 | 56 | $context['trace'] = $throwable->getTrace(); |
57 | 57 | |
58 | - if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') |
|
59 | - (new LogLaddy())->alert(self::INTERNAL_ERROR, $context); |
|
60 | - elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') |
|
61 | - (new LogLaddy())->notice(self::USER_EXCEPTION, $context); |
|
62 | - else |
|
58 | + if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') { |
|
59 | + (new LogLaddy())->alert(self::INTERNAL_ERROR, $context); |
|
60 | + } elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') { |
|
61 | + (new LogLaddy())->notice(self::USER_EXCEPTION, $context); |
|
62 | + } else |
|
63 | 63 | { |
64 | 64 | die('This Throwable is not an Error or an Exception. This is unfortunate.'); |
65 | 65 | } |
@@ -93,15 +93,15 @@ discard block |
||
93 | 93 | error_log($display_error); |
94 | 94 | $display_error.= self::format_trace($context['trace'], false); |
95 | 95 | self::HTTP_500($display_error); |
96 | - } |
|
97 | - elseif($this->system_halted($level)) // analyses error level |
|
96 | + } elseif($this->system_halted($level)) { |
|
97 | + // analyses error level |
|
98 | 98 | { |
99 | 99 | $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, self::format_file($context['file']), $context['line'], $message); |
100 | + } |
|
100 | 101 | error_log($display_error); |
101 | 102 | $display_error.= self::format_trace($context['trace'], true); |
102 | 103 | self::HTTP_500($display_error); |
103 | - } |
|
104 | - else |
|
104 | + } else |
|
105 | 105 | {// --- Handles user messages, through SESSION storage |
106 | 106 | $this->report_to_user($level, $message, $context); |
107 | 107 | } |
@@ -128,11 +128,13 @@ discard block |
||
128 | 128 | // ----------------------------------------------------------- User messages:add one |
129 | 129 | public function report_to_user($level, $message, $context = []) |
130 | 130 | { |
131 | - if(!isset($_SESSION[self::REPORTING_USER])) |
|
132 | - $_SESSION[self::REPORTING_USER] = []; |
|
131 | + if(!isset($_SESSION[self::REPORTING_USER])) { |
|
132 | + $_SESSION[self::REPORTING_USER] = []; |
|
133 | + } |
|
133 | 134 | |
134 | - if(!isset($_SESSION[self::REPORTING_USER][$level])) |
|
135 | - $_SESSION[self::REPORTING_USER][$level] = []; |
|
135 | + if(!isset($_SESSION[self::REPORTING_USER][$level])) { |
|
136 | + $_SESSION[self::REPORTING_USER][$level] = []; |
|
137 | + } |
|
136 | 138 | |
137 | 139 | $_SESSION[self::REPORTING_USER][$level][] = [$message, $context]; |
138 | 140 | } |
@@ -177,8 +179,9 @@ discard block |
||
177 | 179 | $m[E_STRICT]=$m[E_DEPRECATED]=$m[E_USER_DEPRECATED]=$m[E_ALL]=LogLevel::DEBUG; |
178 | 180 | $m[2048]=$m[8192]=$m[16384]=$m[32767]=LogLevel::DEBUG; |
179 | 181 | |
180 | - if(isset($m[$level])) |
|
181 | - return $m[$level]; |
|
182 | + if(isset($m[$level])) { |
|
183 | + return $m[$level]; |
|
184 | + } |
|
182 | 185 | |
183 | 186 | throw new \Exception(__FUNCTION__."($level): $level is unknown"); |
184 | 187 | } |