fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix warning in PHP 8.0

Browse source
This commit is contained in:
conory 2021-07-05 14:19:06 +09:00
parent 375a71866d
commit faea821e78
9 changed files with 103 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/framework/debug.php
View file

@ -805,7 +805,7 @@ class Debug
// Clean up the backtrace.
foreach (array('entries', 'errors', 'queries', 'slow_queries', 'remote_requests', 'slow_remote_requests') as $key)
{
if (!$data->$key)
if (!isset($data->$key) || !is_array($data->$key))
{
continue;
}
@ -819,7 +819,10 @@ class Debug
{
foreach ($entry->backtrace as &$backtrace)
{
$backtrace['file'] = self::translateFilename($backtrace['file']);
if (isset($backtrace['file']))
{
$backtrace['file'] = self::translateFilename($backtrace['file']);
}
unset($backtrace['object'], $backtrace['args']);
}
}

10
common/tpl/debug_comment.html
View file

@ -52,7 +52,10 @@ Debug Entries
echo sprintf('%02d. %s', ++$entry_count, $entry->message) . "\n";
foreach ($entry->backtrace as $key => $backtrace)
{
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
if (isset($backtrace['file']) && isset($backtrace['line']))
{
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
}
}
}
?>
@ -72,7 +75,10 @@ PHP Errors and Warnings
echo sprintf('%02d. %s: %s', ++$error_count, $error->type, $error->message) . "\n";
foreach ($error->backtrace as $key => $backtrace)
{
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
if (isset($backtrace['file']) && isset($backtrace['line']))
{
echo sprintf(' - %s line %d', $backtrace['file'], $backtrace['line']) . "\n";
}
}
}
?>