@@ -18,8 +18,9 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | $should_display = ini_get('display_errors') == '1'; |
| 20 | 20 | |
| 21 | - if($should_display && !empty($error_message)) |
|
| 22 | - echo('<pre style="z-index:9999; background-color:#FFF; color:#000; padding:0.5em; font-size:0.7em; margin:0 0 1em 0; font-family:courier;">'.$error_message.'</pre>'); |
|
| 21 | + if($should_display && !empty($error_message)) { |
|
| 22 | + echo('<pre style="z-index:9999; background-color:#FFF; color:#000; padding:0.5em; font-size:0.7em; margin:0 0 1em 0; font-family:courier;">'.$error_message.'</pre>'); |
|
| 23 | + } |
|
| 23 | 24 | } |
| 24 | 25 | |
| 25 | 26 | // ----------------------------------------------------------- visual dump (depends on env) |
@@ -43,8 +44,7 @@ discard block |
||
| 43 | 44 | $backtrace = $var->getTrace(); |
| 44 | 45 | $full_backtrace = true; |
| 45 | 46 | $var_dump = self::format_throwable_message(get_class($var), $var->getCode(), $var->getFile(), $var->getLine(), $var->getMessage()); |
| 46 | - } |
|
| 47 | - else |
|
| 47 | + } else |
|
| 48 | 48 | { |
| 49 | 49 | $backtrace = debug_backtrace(); |
| 50 | 50 | |
@@ -80,42 +80,44 @@ discard block |
||
| 80 | 80 | $function_name = $trace['function'] ?? '?'; |
| 81 | 81 | $class_name = $trace['class'] ?? '?'; |
| 82 | 82 | |
| 83 | - if(self::is_debugger_function($class_name, $function_name)) |
|
| 84 | - continue; |
|
| 83 | + if(self::is_debugger_function($class_name, $function_name)) { |
|
| 84 | + continue; |
|
| 85 | + } |
|
| 85 | 86 | |
| 86 | 87 | if(!self::is_debugger_call($function_name) && isset($trace['args'])) |
| 87 | 88 | { |
| 88 | 89 | $args = []; |
| 89 | 90 | foreach($trace['args'] as $arg) |
| 90 | 91 | { |
| 91 | - if(is_null($arg)) |
|
| 92 | - $args[]= 'null'; |
|
| 93 | - elseif(is_bool($arg)) |
|
| 94 | - $args[]= $arg === true ? 'bool:true' : 'bool:false'; |
|
| 95 | - elseif(is_string($arg) || is_numeric($arg)) |
|
| 96 | - $args[]= $arg; |
|
| 97 | - elseif(is_object($arg)) |
|
| 98 | - $args[]= get_class($arg); |
|
| 99 | - elseif(is_array($arg)) |
|
| 100 | - $args[]= 'Array #'.count($arg); |
|
| 101 | - else |
|
| 92 | + if(is_null($arg)) { |
|
| 93 | + $args[]= 'null'; |
|
| 94 | + } elseif(is_bool($arg)) { |
|
| 95 | + $args[]= $arg === true ? 'bool:true' : 'bool:false'; |
|
| 96 | + } elseif(is_string($arg) || is_numeric($arg)) { |
|
| 97 | + $args[]= $arg; |
|
| 98 | + } elseif(is_object($arg)) { |
|
| 99 | + $args[]= get_class($arg); |
|
| 100 | + } elseif(is_array($arg)) { |
|
| 101 | + $args[]= 'Array #'.count($arg); |
|
| 102 | + } else |
|
| 102 | 103 | { |
| 103 | 104 | var_dump($arg); |
| 104 | 105 | $args[] = '!!OTHER!!'; |
| 105 | 106 | } |
| 106 | 107 | } |
| 107 | 108 | $args = implode(', ', $args); |
| 109 | + } else { |
|
| 110 | + $args = microtime(true); |
|
| 108 | 111 | } |
| 109 | - else |
|
| 110 | - $args = microtime(true); |
|
| 111 | 112 | |
| 112 | 113 | $call_file = isset($trace['file']) ? basename($trace['file']) : '?'; |
| 113 | 114 | $call_line = $trace['line'] ?? '?'; |
| 114 | 115 | |
| 115 | 116 | $formated_traces []= sprintf('[%-23.23s %3s] %'.($depth*3).'s%s%s(%s)', $call_file, $call_line,' ', "$class_name::", $function_name, $args); |
| 116 | 117 | |
| 117 | - if($full_backtrace === false) |
|
| 118 | - break; |
|
| 118 | + if($full_backtrace === false) { |
|
| 119 | + break; |
|
| 120 | + } |
|
| 119 | 121 | } |
| 120 | 122 | |
| 121 | 123 | return implode(PHP_EOL, array_reverse($formated_traces)); |