Fix object handling inside log arrays

diff --git a/src/Util/Logger/AbstractLogger.php b/src/Util/Logger/AbstractLogger.php
index 4d653ae9b666a59940780b81f15f68ac401c2bc8..110a806874791c5c5175cda1563ef022e39e67dd 100644 (file)
--- a/src/Util/Logger/AbstractLogger.php
+++ b/src/Util/Logger/AbstractLogger.php
@@ -103,6 +103,28 @@ abstract class AbstractLogger implements LoggerInterface
                return strtr($message, $replace);
        }
 
+       /**
+        * JSON Encodes an complete array including objects with "__toString()" methods
+        *
+        * @param array $input an Input Array to encode
+        *
+        * @return false|string The json encoded output of the array
+        */
+       protected function jsonEncodeArray(array $input)
+       {
+               $output = [];
+
+               foreach ($input as $key => $value) {
+                       if (method_exists($value, '__toString')) {
+                               $output[$key] = $value->__toString();
+                       } else {
+                               $output[$key] = $value;
+                       }
+               }
+
+               return @json_encode($output);
+       }
+
        /**
         * {@inheritdoc}
         */

diff --git a/src/Util/Logger/StreamLogger.php b/src/Util/Logger/StreamLogger.php
index 035e7ecee41d4e7e51f022359ac98647b7b5214b..5912e70904d551ae7e8be0557c3799e37e50fe9f 100644 (file)
--- a/src/Util/Logger/StreamLogger.php
+++ b/src/Util/Logger/StreamLogger.php
@@ -161,8 +161,8 @@ class StreamLogger extends AbstractLogger
                $logMessage .= $this->channel . ' ';
                $logMessage .= '[' . strtoupper($level) . ']: ';
                $logMessage .= $this->psrInterpolate($message, $context) . ' ';
-               $logMessage .= @json_encode($context) . ' - ';
-               $logMessage .= @json_encode($record);
+               $logMessage .= $this->jsonEncodeArray($context) . ' - ';
+               $logMessage .= $this->jsonEncodeArray($record);
                $logMessage .= PHP_EOL;
 
                return $logMessage;

diff --git a/src/Util/Logger/SyslogLogger.php b/src/Util/Logger/SyslogLogger.php
index 101baad38aa4fa48951d092716ca25061a88e305..ae39ad958829e9195ff15b7f85efbc3dab458bbe 100644 (file)
--- a/src/Util/Logger/SyslogLogger.php
+++ b/src/Util/Logger/SyslogLogger.php
@@ -195,8 +195,8 @@ class SyslogLogger extends AbstractLogger
                $logMessage .= $this->channel . ' ';
                $logMessage .= '[' . $this->logToString[$level] . ']: ';
                $logMessage .= $this->psrInterpolate($message, $context) . ' ';
-               $logMessage .= @json_encode($context) . ' - ';
-               $logMessage .= @json_encode($record);
+               $logMessage .= $this->jsonEncodeArray($context) . ' - ';
+               $logMessage .= $this->jsonEncodeArray($record);
 
                return $logMessage;
        }

diff --git a/tests/src/Util/Logger/AbstractLoggerTest.php b/tests/src/Util/Logger/AbstractLoggerTest.php
index 33bf2356161b40fce2cffc18bb7fa4d2dbd7b1a2..e9f183081dc13e17586997bfc5465dbadac674da 100644 (file)
--- a/tests/src/Util/Logger/AbstractLoggerTest.php
+++ b/tests/src/Util/Logger/AbstractLoggerTest.php
@@ -159,4 +159,23 @@ abstract class AbstractLoggerTest extends MockedTest
 
                self::assertContains(@json_encode($context), $text);
        }
+
+       /**
+        * Test a message with an exception
+        */
+       public function testExceptionHandling()
+       {
+               $e = new \Exception("Test String", 123);
+               $eFollowUp = new \Exception("FollowUp", 456, $e);
+
+               $assertion = $eFollowUp->__toString();
+
+               $logger = $this->getInstance();
+               $logger->alert('test', ['e' => $eFollowUp]);
+               $text = $this->getContent();
+
+               self::assertLogline($text);
+
+               self::assertContains(@json_encode($assertion), $this->getContent());
+       }
 }