PHPUnit 6

Author: Slamdunk

lib/ErrorHandler.php

@@ -118,7 +118,10 @@ public function setLogErrors(bool $logErrors)
     public function logErrors() : bool
     {
         if ($this->logErrors === null) {
-            $this->setLogErrors(! interface_exists(\PHPUnit_Framework_Test::class));
+            $this->setLogErrors(
+                    ! interface_exists(\PHPUnit_Framework_Test::class)
+                and ! interface_exists(\PHPUnit\Framework\Test::class)
+            );
         }
 
         return $this->logErrors;

tests/ErrorHandlerTest.php

@@ -6,8 +6,9 @@
 
 use ErrorException;
 use Slam\ErrorHandler\ErrorHandler;
+use PHPUnit\Framework\TestCase;
 
-final class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
+final class ErrorHandlerTest extends TestCase
 {
     private $backupErrorLog;
     private $errorLog;
@@ -76,7 +77,7 @@ public function testRegisterBuiltinHandlers()
 
         @ $arrayPerVerificaErrori['no_exception_thrown_on_undefined_index_now'];
 
-        $this->setExpectedException(ErrorException::class);
+        $this->expectException(ErrorException::class);
         $arrayPerVerificaErrori['undefined_index'];
     }