Merge branch 'stable'

# Conflicts:
#	changelogs/3.14.md
#	resources/vanilla
#	src/VersionInfo.php
#	src/entity/Attribute.php
This commit is contained in:
Dylan K. Taylor
2020-07-08 11:46:02 +01:00
6 changed files with 34 additions and 4 deletions

View File

@@ -153,12 +153,12 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
$this->buffer(function() use ($e, $trace) : void{
$this->critical(self::printExceptionMessage($e));
foreach(Utils::printableTrace($trace) as $line){
$this->debug($line, true);
$this->critical($line);
}
for($prev = $e->getPrevious(); $prev !== null; $prev = $prev->getPrevious()){
$this->debug("Previous: " . self::printExceptionMessage($prev), true);
$this->critical("Previous: " . self::printExceptionMessage($prev));
foreach(Utils::printableTrace($prev->getTrace()) as $line){
$this->debug(" " . $line, true);
$this->critical(" " . $line);
}
}
});