mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 17:46:09 +02:00
Code Issues Releases Wiki Activity

Remove code duplication, refs #435

Browse Source
This commit is contained in:
Jordi Boggiano
2014-12-28 16:28:20 +00:00
parent 33ebc242eb
commit 3e1b8a7afe
3 changed files with 25 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Monolog/Formatter/LineFormatter.php
View File

@@ -73,7 +73,7 @@ class LineFormatter extends NormalizerFormatter
foreach ($vars['extra'] as $var => $val) {
if (false !== strpos($output, '%extra.'.$var.'%')) {
$output = str_replace('%extra.'.$var.'%', $this->replaceNewlines($this->convertToString($val)), $output);
$output = str_replace('%extra.'.$var.'%', $this->stringify($val), $output);
unset($vars['extra'][$var]);
}
}
@@ -92,7 +92,7 @@ class LineFormatter extends NormalizerFormatter
foreach ($vars as $var => $val) {
if (false !== strpos($output, '%'.$var.'%')) {
$output = str_replace('%'.$var.'%', $this->replaceNewlines($this->convertToString($val)), $output);
$output = str_replace('%'.$var.'%', $this->stringify($val), $output);
}
}
@@ -109,6 +109,11 @@ class LineFormatter extends NormalizerFormatter
return $message;
}
public function stringify($value)
{
return $this->replaceNewlines($this->convertToString($value));
}
protected function normalizeException(Exception $e)
{
$previousText = '';