From da9b2d3406ee0e5452631e0a42f74ae8a9c4ee84 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 15 Jul 2018 00:04:08 +0200
Subject: [PATCH] Fix mini bugs

---
 Log/FileLogger.php           | 12 ++++++------
 tests/Log/FileLoggerTest.php | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Log/FileLogger.php b/Log/FileLogger.php
index b8f0ec565..ce84e89c4 100644
--- a/Log/FileLogger.php
+++ b/Log/FileLogger.php
@@ -186,8 +186,8 @@ final class FileLogger implements LoggerInterface
             return false;
         }
 
-        $mtime = \explode(' ', microtime());
-        $mtime = (int) $mtime[1] + (int) $mtime[0];
+        $temp  = \explode(' ', \microtime());
+        $mtime = ((float) $temp[1]) + ((float) $temp[0]);
 
         self::$timings[$id] = ['start' => $mtime];
 
@@ -205,8 +205,8 @@ final class FileLogger implements LoggerInterface
      */
     public static function endTimeLog($id = '') : float
     {
-        $mtime = \explode(' ', microtime());
-        $mtime = (int) $mtime[1] + (int) $mtime[0];
+        $temp  = \explode(' ', \microtime());
+        $mtime = ((float) $temp[1]) + ((float) $temp[0]);
 
         self::$timings[$id]['end']  = $mtime;
         self::$timings[$id]['time'] = $mtime - self::$timings[$id]['start'];
@@ -532,7 +532,7 @@ final class FileLogger implements LoggerInterface
         if ($this->fp === false) {
             return $log;
         }
-        
+
         \fseek($this->fp, 0);
 
         while (($line = \fgetcsv($this->fp, 0, ';')) !== false && $current <= $id) {
@@ -579,7 +579,7 @@ final class FileLogger implements LoggerInterface
         }
 
         if ($verbose) {
-            echo $message;
+            echo $this->interpolate($message, $context);
         } else {
             $this->info($message, $context);
         }
diff --git a/tests/Log/FileLoggerTest.php b/tests/Log/FileLoggerTest.php
index 8ee028563..a9e07e858 100644
--- a/tests/Log/FileLoggerTest.php
+++ b/tests/Log/FileLoggerTest.php
@@ -55,7 +55,7 @@ class FileLoggerTest extends \PHPUnit\Framework\TestCase
             unlink(__DIR__ . '/test.log');
         }
 
-        $log = new FileLogger(__DIR__ . '/test.log', true);
+        $log = new FileLogger(__DIR__ . '/test.log', false);
 
         $log->emergency(FileLogger::MSG_FULL, [
             'message' => 'msg',
@@ -121,17 +121,17 @@ class FileLoggerTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(2, $log->countLogs()['debug'] ?? 0);
 
         self::assertEquals(['0.0.0.0' => 9], $log->getHighestPerpetrator());
-        self::assertEquals([5, 6, 7, 8, 9], array_keys($log->get(5, 1)));
+        self::assertEquals([6, 7, 8, 9, 10], array_keys($log->get(5, 1)));
         self::assertEquals('alert', $log->getByLine(2)['level']);
 
         ob_start();
-        $log->console(FileLogger::MSG_FULL, false, [
+        $log->console(FileLogger::MSG_FULL, true, [
             'message' => 'msg',
             'line'    => 11,
             'file'    => FileLoggerTest::class,
         ]);
         $ob = ob_get_clean();
-        self::assertEquals(2, $log->countLogs()['info'] ?? 0);
+        self::assertEquals(1, $log->countLogs()['info'] ?? 0);
         self::assertTrue(stripos($ob, 'msg;') !== false);
 
         ob_start();
@@ -165,7 +165,7 @@ class FileLoggerTest extends \PHPUnit\Framework\TestCase
     {
         self::assertTrue(FileLogger::startTimeLog('test'));
         self::assertFalse(FileLogger::startTimeLog('test'));
-        self::assertGreaterThan(0, FileLogger::endTimeLog('test'));
+        self::assertGreaterThan(0.0, FileLogger::endTimeLog('test'));
     }
 
     public static function tearDownAfterClass()