Fix logger that wasn't able to log \Throwable

Author: phpbg

src/Logger/Console.php

@@ -103,11 +103,11 @@ private function format(string $level, string $message, array $context): string
 
     /**
      * Format an exception
-     * @param \Exception $e
+     * @param \Throwable $e
      * @param string $newLine Optionnal new line char
      * @return string
      */
-    protected function formatException(\Exception $e, $newLine = PHP_EOL)
+    protected function formatException(\Throwable $e, $newLine = PHP_EOL): string
     {
         $message = '';
 
@@ -130,11 +130,11 @@ protected function formatException(\Exception $e, $newLine = PHP_EOL)
     /**
      * Format an exception as string
      *
-     * @param \Exception $e
+     * @param \Throwable $e
      * @param string $newLine
      * @return string
      */
-    protected function _formatException(\Exception $e, string $newLine = PHP_EOL): string
+    protected function _formatException(\Throwable $e, string $newLine = PHP_EOL): string
     {
         return get_class($e) . ': ' . $e->getMessage() . $newLine . '#> ' . $e->getFile() . '(' . $e->getLine() . ')' . $newLine . $e->getTraceAsString();
     }

tests/Logger/ConsoleTest.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2018 Samuel CHEMLA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace PhpBg\MiniHttpd\Tests\Logger;
+
+use PhpBg\MiniHttpd\Logger\Console;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
+
+class ConsoleTest extends TestCase
+{
+    public function testLogException() {
+        $output = fopen('php://memory', 'w+');
+        $logger = new Console(LogLevel::DEBUG, $output);
+
+        $logger->error("foo", ['exception' => new \Exception("bar")]);
+
+        rewind($output);
+        $this->assertNotEmpty(stream_get_contents($output));
+    }
+
+    public function testLogExceptionWithPrevious() {
+        $output = fopen('php://memory', 'w+');
+        $logger = new Console(LogLevel::DEBUG, $output);
+
+        $logger->error("foo", ['exception' => new \Exception("bar", 0, new \Exception("baz"))]);
+
+        rewind($output);
+        $this->assertNotEmpty(stream_get_contents($output));
+    }
+
+    public function testLogError() {
+        $output = fopen('php://memory', 'w+');
+        $logger = new Console(LogLevel::DEBUG, $output);
+
+        $logger->error("foo", ['exception' => new \Error("bar")]);
+
+        rewind($output);
+        $this->assertNotEmpty(stream_get_contents($output));
+    }
+
+}