Fix logger behaviour when a context is present

Author: phpbg

src/Logger/ConsoleFormatter.php

@@ -54,10 +54,16 @@ public function __invoke(string $level, string $message, array $context): string
         }
 
         if (!empty($context)) {
-            $message .= ' ' . \json_encode($context, JSON_PARTIAL_OUTPUT_ON_ERROR);
-            $jsonMsg = \json_last_error_msg();
-            if (!empty($jsonMsg)) {
-                $message .= "<could not log full context because of: {$jsonMsg}>";
+            $jsonMessage = \json_encode($context, JSON_PARTIAL_OUTPUT_ON_ERROR);
+            if (\json_last_error() !== JSON_ERROR_NONE) {
+                $jsonMsg = \json_last_error_msg();
+                if (!empty($jsonMsg)) {
+                    $message .= " <could not log full context because of: {$jsonMsg}>";
+                }
+            }
+            if ($jsonMessage !== false) {
+                // log even partial messages
+                $message .= ' ' . $jsonMessage;
             }
         }
 

src/Renderer/Json.php

@@ -45,6 +45,7 @@ public function render(ServerRequestInterface $request, ResponseInterface $respo
         $dataStr = json_encode($data, $opts);
         if ($dataStr === false) {
             // Check for JSON error
+            // Note that $dataStr may be !== false even if an error occured, if using JSON_PARTIAL_OUTPUT_ON_ERROR
             $err = json_last_error();
             if ($err !== JSON_ERROR_NONE) {
                 $response = $response->withStatus(500);

tests/Logger/ConsoleTest.php

@@ -44,6 +44,32 @@ public function testLogException()
         $this->assertNotEmpty(stream_get_contents($output));
     }
 
+    public function testLogWithContext()
+    {
+        $output = fopen('php://memory', 'w+');
+        $logger = new Console(LogLevel::DEBUG, $output);
+
+        $logger->error("foo", ['bar' => 'baz']);
+
+        rewind($output);
+        $msg = stream_get_contents($output);
+        $this->assertNotEmpty($msg);
+        $this->assertFalse(strpos($msg, 'could not log full context'));
+    }
+
+    public function testLogWithContextNotJsonEncodable()
+    {
+        $output = fopen('php://memory', 'w+');
+        $logger = new Console(LogLevel::DEBUG, $output);
+
+        $logger->error("foo", ['bar' => \log(0)]);
+
+        rewind($output);
+        $msg = stream_get_contents($output);
+        $this->assertNotEmpty($msg);
+        $this->assertTrue(strpos($msg, 'could not log full context') !== false);
+    }
+
     public function testLogExceptionWithPrevious()
     {
         $output = fopen('php://memory', 'w+');