diff --git a/kiri-engine/Abstracts/Logger.php b/kiri-engine/Abstracts/Logger.php index 42a7c4a5..7c18e9a9 100644 --- a/kiri-engine/Abstracts/Logger.php +++ b/kiri-engine/Abstracts/Logger.php @@ -233,15 +233,15 @@ class Logger implements LoggerInterface */ private function _string($context): string { - if ($context instanceof \Throwable) { - $context = 'file -> ' . $context->getFile() . PHP_EOL . 'line -> ' . $context->getLine() . PHP_EOL; - } - if (is_array($context) && isset($context[0]) && $context[0] instanceof \Throwable) { - $context = 'file -> ' . $context[0]->getFile() . PHP_EOL . 'line -> ' . $context[0]->getLine() . PHP_EOL; - } if (is_string($context)) { return $context . PHP_EOL; } + if ($context instanceof \Throwable) { + return 'file -> ' . $context->getFile() . PHP_EOL . 'line -> ' . $context->getLine() . PHP_EOL; + } + if (is_array($context) && isset($context[0]) && $context[0] instanceof \Throwable) { + return 'file -> ' . $context[0]->getFile() . PHP_EOL . 'line -> ' . $context[0]->getLine() . PHP_EOL; + } return implode(PHP_EOL, $context); } } diff --git a/kiri-engine/Error/StdoutLogger.php b/kiri-engine/Error/StdoutLogger.php index 91d9597e..f158776f 100644 --- a/kiri-engine/Error/StdoutLogger.php +++ b/kiri-engine/Error/StdoutLogger.php @@ -28,7 +28,7 @@ class StdoutLogger extends Logger } else { $this->errors[$model] = $message; } - $this->error($model, [$message]); + $this->error($model, [throwable($message)]); return false; }