Update error.tpl

This commit is contained in:
邹景立 2021-06-17 13:35:25 +08:00
parent 2ff8d3aaf7
commit 519ad1cfb8

View File

@ -13,80 +13,80 @@ if (!function_exists('parse_class')) {
{ {
$names = explode('\\', $name); $names = explode('\\', $name);
return '<abbr title="' . $name . '">' . end($names) . '</abbr>'; return '<abbr title="' . $name . '">' . end($names) . '</abbr>';
} }
} }
if (!function_exists('parse_file')) { if (!function_exists('parse_file')) {
function parse_file($file, $line) function parse_file($file, $line)
{ {
return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>'; return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>';
} }
} }
if (!function_exists('parse_args')) { if (!function_exists('parse_args')) {
function parse_args($args) function parse_args($args)
{ {
$result = []; $result = [];
foreach ($args as $key => $item) { foreach ($args as $key => $item) {
switch (true) { switch (true) {
case is_object($item): case is_object($item):
$value = sprintf('<em>object</em>(%s)', parse_class(get_class($item))); $value = sprintf('<em>object</em>(%s)', parse_class(get_class($item)));
break; break;
case is_array($item): case is_array($item):
if (count($item) > 3) { if (count($item) > 3) {
$value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3))); $value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3)));
} else { } else {
$value = sprintf('[%s]', parse_args($item)); $value = sprintf('[%s]', parse_args($item));
} }
break; break;
case is_string($item): case is_string($item):
if (strlen($item) > 20) { if (strlen($item) > 20) {
$value = sprintf( $value = sprintf(
'\'<a class="toggle" title="%s">%s...</a>\'', '\'<a class="toggle" title="%s">%s...</a>\'',
htmlentities($item), htmlentities($item),
htmlentities(substr($item, 0, 20)) htmlentities(substr($item, 0, 20))
); );
} else { } else {
$value = sprintf("'%s'", htmlentities($item)); $value = sprintf("'%s'", htmlentities($item));
} }
break; break;
case is_int($item): case is_int($item):
case is_float($item): case is_float($item):
$value = $item; $value = $item;
break; break;
case is_null($item): case is_null($item):
$value = '<em>null</em>'; $value = '<em>null</em>';
break; break;
case is_bool($item): case is_bool($item):
$value = '<em>' . ($item ? 'true' : 'false') . '</em>'; $value = '<em>' . ($item ? 'true' : 'false') . '</em>';
break; break;
case is_resource($item): case is_resource($item):
$value = '<em>resource</em>'; $value = '<em>resource</em>';
break; break;
default: default:
$value = htmlentities(str_replace("\n", '', var_export(strval($item), true))); $value = htmlentities(str_replace("\n", '', var_export(strval($item), true)));
break; break;
} }
$result[] = is_int($key) ? $value : "'{$key}' => {$value}"; $result[] = is_int($key) ? $value : "'{$key}' => {$value}";
} }
return implode(', ', $result); return implode(', ', $result);
} }
} }
if (!function_exists('echo_value')) { if (!function_exists('echo_value')) {
function echo_value($val) function echo_value($val)
{ {
if (is_array($val) || is_object($val)) { if (is_array($val) || is_object($val)) {
echo htmlentities(json_encode($val, JSON_PRETTY_PRINT)); echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
} elseif (is_bool($val)) { } elseif (is_bool($val)) {
echo $val ? 'true' : 'false'; echo $val ? 'true' : 'false';
} elseif (is_scalar($val)) { } elseif (is_scalar($val)) {
echo htmlentities($val); echo htmlentities($val);
} else { } else {
echo 'Resource'; echo 'Resource';
} }
} }
} }
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -374,37 +374,31 @@ echo 'Resource';
</head> </head>
<body> <body>
<?php if (\think\facade\App::isDebug()) { ?> <?php if (\think\facade\App::isDebug()) { ?>
<?php foreach ($traces as $index => $trace) { ?> <?php foreach ($traces as $index => $trace) { ?>
<div class="exception"> <div class="exception">
<div class="message"> <div class="message">
<div class="info"> <div class="info">
<div> <div>
<h2><?php echo "#{$index} [{$trace['code']}]" . sprintf('%s in %s', parse_class($trace['name']), parse_file($trace['file'], $trace['line'])); ?></h2> <h2><?php echo "#{$index} [{$trace['code']}]" . sprintf('%s in %s', parse_class($trace['name']), parse_file($trace['file'], $trace['line'])); ?></h2>
</div>
<div><h1><?php echo nl2br(htmlentities($trace['message'])); ?></h1></div>
</div>
</div> </div>
<div><h1><?php echo nl2br(htmlentities($trace['message'])); ?></h1></div> <?php if (!empty($trace['source'])) { ?>
</div> <div class="source-code">
</div> <pre class="prettyprint lang-php"><ol start="<?php echo $trace['source']['first']; ?>"><?php foreach ((array)$trace['source']['source'] as $key => $value) { ?><li class="line-<?php echo " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : ''); ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
<?php if (!empty($trace['source'])) { ?> </div>
<div class="source-code"> <?php } ?>
<pre class="prettyprint lang-php"><ol start="<?php echo $trace['source']['first']; ?>"><?php foreach ((array)$trace['source']['source'] as $key => $value) { ?><li class="line-<?php echo " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : ''); ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre> <div class="trace">
</div> <h2 data-expand="<?php echo 0 === $index ? '1' : '0'; ?>">Call Stack</h2>
<?php } ?> <ol>
<div class="trace"> <li><?php echo sprintf('in %s', parse_file($trace['file'], $trace['line'])); ?></li>
<h2 data-expand="<?php echo 0 === $index ? '1' : '0'; ?>">Call Stack</h2> <?php foreach ((array)$trace['trace'] as $value) { ?>
<ol> <li>
<li><?php echo sprintf('in %s', parse_file($trace['file'], $trace['line'])); ?></li> <?php
<?php foreach ((array)$trace['trace'] as $value) { ?>
<li>
<?php
// Show Function // Show Function
if ($value['function']) { if ($value['function']) {
echo sprintf( echo sprintf('at %s%s%s(%s)', isset($value['class']) ? parse_class($value['class']) : '', $value['type'] ?? '', $value['function'], isset($value['args']) ? parse_args($value['args']) : '');
'at %s%s%s(%s)',
isset($value['class']) ? parse_class($value['class']) : '',
isset($value['type']) ? $value['type'] : '',
$value['function'],
isset($value['args']) ? parse_args($value['args']) : ''
);
} }
// Show line // Show line
@ -412,163 +406,163 @@ echo 'Resource';
echo sprintf(' in %s', parse_file($value['file'], $value['line'])); echo sprintf(' in %s', parse_file($value['file'], $value['line']));
} }
?> ?>
</li> </li>
<?php } ?> <?php } ?>
</ol> </ol>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } else { ?>
<div class="exception"> <div class="exception">
<div class="info"><h1><?php echo htmlentities($message); ?></h1></div> <div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
</div> </div>
<?php } ?> <?php } ?>
<?php if (!empty($datas)) { ?> <?php if (!empty($datas)) { ?>
<div class="exception-var"> <div class="exception-var">
<h2>Exception Datas</h2> <h2>Exception Datas</h2>
<?php foreach ((array)$datas as $label => $value) { ?> <?php foreach ((array)$datas as $label => $value) { ?>
<table> <table>
<?php if (empty($value)) { ?> <?php if (empty($value)) { ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ((array)$value as $key => $val) { ?> <?php foreach ((array)$value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td><?php echo_value($val); ?></td> <td><?php echo_value($val); ?></td>
</tr> </tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
<?php } ?> <?php } ?>
</tbody> </div>
<?php } ?>
</table>
<?php } ?>
</div>
<?php } ?> <?php } ?>
<?php if (!empty($tables)) { ?> <?php if (!empty($tables)) { ?>
<div class="exception-var"> <div class="exception-var">
<h2>Environment Variables</h2> <h2>Environment Variables</h2>
<?php foreach ((array)$tables as $label => $value) { ?> <?php foreach ((array)$tables as $label => $value) { ?>
<table> <table>
<?php if (empty($value)) { ?> <?php if (empty($value)) { ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ((array)$value as $key => $val) { ?> <?php foreach ((array)$value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td><?php echo_value($val); ?></td> <td><?php echo_value($val); ?></td>
</tr> </tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
<?php } ?> <?php } ?>
</tbody> </div>
<?php } ?>
</table>
<?php } ?>
</div>
<?php } ?> <?php } ?>
<?php if (\think\facade\App::isDebug()) { ?> <?php if (\think\facade\App::isDebug()) { ?>
<script> <script>
function $(selector, node) { function $(selector, node) {
var elements; var elements;
node = node || document;
if (document.querySelectorAll) {
elements = node.querySelectorAll(selector);
} else {
switch (selector.substr(0, 1)) {
case '#':
elements = [node.getElementById(selector.substr(1))];
break;
case '.':
if (document.getElementsByClassName) {
elements = node.getElementsByClassName(selector.substr(1));
} else {
elements = get_elements_by_class(selector.substr(1), node);
}
break;
default:
elements = node.getElementsByTagName();
}
}
return elements;
function get_elements_by_class(search_class, node, tag) {
var elements = [], eles,
pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
node = node || document; node = node || document;
tag = tag || '*'; if (document.querySelectorAll) {
elements = node.querySelectorAll(selector);
eles = node.getElementsByTagName(tag); } else {
for (var i = 0; i < eles.length; i++) { switch (selector.substr(0, 1)) {
if (pattern.test(eles[i].className)) { case '#':
elements.push(eles[i]) elements = [node.getElementById(selector.substr(1))];
break;
case '.':
if (document.getElementsByClassName) {
elements = node.getElementsByClassName(selector.substr(1));
} else {
elements = get_elements_by_class(selector.substr(1), node);
}
break;
default:
elements = node.getElementsByTagName();
} }
} }
return elements; return elements;
}
}
$.getScript = function (src, func) { function get_elements_by_class(search_class, node, tag) {
var script = document.createElement('script'); var elements = [], eles,
pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
script.async = 'async'; node = node || document;
script.src = src; tag = tag || '*';
script.onload = func || function () {
};
$('head')[0].appendChild(script); eles = node.getElementsByTagName(tag);
} for (var i = 0; i < eles.length; i++) {
if (pattern.test(eles[i].className)) {
;(function () { elements.push(eles[i])
var files = $('.toggle'); }
var ol = $('ol', $('.prettyprint')[0]);
var li = $('li', ol[0]);
// 短路径和长路径变换
for (var i = 0; i < files.length; i++) {
files[i].ondblclick = function () {
var title = this.title;
this.title = this.innerHTML;
this.innerHTML = title;
}
}
(function () {
var expand = function (dom, expand) {
var ol = $('ol', dom.parentNode)[0];
expand = undefined === expand ? dom.attributes['data-expand'].value === '0' : undefined;
if (expand) {
dom.attributes['data-expand'].value = '1';
ol.style.display = 'none';
dom.innerText = 'Call Stack (展开)';
} else {
dom.attributes['data-expand'].value = '0';
ol.style.display = 'block';
dom.innerText = 'Call Stack (折叠)';
} }
};
var traces = $('.trace');
for (var i = 0; i < traces.length; i++) {
var h2 = $('h2', traces[i])[0];
expand(h2);
h2.onclick = function () {
expand(this);
};
}
})();
$.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function () { return elements;
prettyPrint(); }
}); }
})();
</script> $.getScript = function (src, func) {
var script = document.createElement('script');
script.async = 'async';
script.src = src;
script.onload = func || function () {
};
$('head')[0].appendChild(script);
}
;(function () {
var files = $('.toggle');
var ol = $('ol', $('.prettyprint')[0]);
var li = $('li', ol[0]);
// 短路径和长路径变换
for (var i = 0; i < files.length; i++) {
files[i].ondblclick = function () {
var title = this.title;
this.title = this.innerHTML;
this.innerHTML = title;
}
}
(function () {
var expand = function (dom, expand) {
var ol = $('ol', dom.parentNode)[0];
expand = undefined === expand ? dom.attributes['data-expand'].value === '0' : undefined;
if (expand) {
dom.attributes['data-expand'].value = '1';
ol.style.display = 'none';
dom.innerText = 'Call Stack (展开)';
} else {
dom.attributes['data-expand'].value = '0';
ol.style.display = 'block';
dom.innerText = 'Call Stack (折叠)';
}
};
var traces = $('.trace');
for (var i = 0; i < traces.length; i++) {
var h2 = $('h2', traces[i])[0];
expand(h2);
h2.onclick = function () {
expand(this);
};
}
})();
$.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function () {
prettyPrint();
});
})();
</script>
<?php } ?> <?php } ?>
</body> </body>
</html> </html>