Merge branch 'master' into developorigin/develop

2 files changed, 8 insertions, 3 deletions

diff --git a/composer.json b/composer.json
index 1780839..e33f70c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "katzgrau/klogger",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "A Simple Logging Class",
     "keywords": ["logging"],
     "require": {
@@ -8,7 +8,7 @@
         "psr/log": "^1.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*"
+        "phpunit/phpunit": "^6.0.0"
     },
     "license": "MIT",
     "authors": [
diff --git a/tests/LoggerTest.php b/tests/LoggerTest.php
index 355b045..8cae00e 100644
--- a/tests/LoggerTest.php
+++ b/tests/LoggerTest.php
@@ -3,7 +3,7 @@
 use Katzgrau\KLogger\Logger;
 use Psr\Log\LogLevel;
 
-class LoggerTest extends PHPUnit_Framework_TestCase
+class LoggerTest extends PHPUnit\Framework\TestCase
 {
     private $logPath;
 
@@ -62,6 +62,7 @@ class LoggerTest extends PHPUnit_Framework_TestCase
 
     private function getLastLine($filename)
     {
+        $size = filesize($filename);
         $fp = fopen($filename, 'r');
         $pos = -2; // start from second to last char
         $t = ' ';
@@ -70,6 +71,10 @@ class LoggerTest extends PHPUnit_Framework_TestCase
             fseek($fp, $pos, SEEK_END);
             $t = fgetc($fp);
             $pos = $pos - 1;
+            if ($size + $pos < -1) {
+                rewind($fp);
+                break;
+            }
         }
 
         $t = fgets($fp);