From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Sat, 7 Sep 2019 16:12:06 -1000
Subject: Compatibility with recent PHPUnit (8)

---
 tests/Monolog/Formatter/ElasticaFormatterTest.php    | 2 +-
 tests/Monolog/Formatter/GelfMessageFormatterTest.php | 2 +-
 tests/Monolog/Formatter/LogstashFormatterTest.php    | 8 --------
 tests/Monolog/Formatter/MongoDBFormatterTest.php     | 2 +-
 tests/Monolog/Formatter/NormalizerFormatterTest.php  | 8 --------
 tests/Monolog/Formatter/ScalarFormatterTest.php      | 2 +-
 tests/Monolog/Handler/BrowserConsoleHandlerTest.php  | 2 +-
 tests/Monolog/Handler/ChromePHPHandlerTest.php       | 2 +-
 tests/Monolog/Handler/DeduplicationHandlerTest.php   | 2 +-
 tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php | 2 +-
 tests/Monolog/Handler/DynamoDbHandlerTest.php        | 2 +-
 tests/Monolog/Handler/ElasticSearchHandlerTest.php   | 2 +-
 tests/Monolog/Handler/ErrorLogHandlerTest.php        | 2 +-
 tests/Monolog/Handler/FirePHPHandlerTest.php         | 2 +-
 tests/Monolog/Handler/FleepHookHandlerTest.php       | 2 +-
 tests/Monolog/Handler/FlowdockHandlerTest.php        | 2 +-
 tests/Monolog/Handler/GelfHandlerLegacyTest.php      | 2 +-
 tests/Monolog/Handler/GelfHandlerTest.php            | 2 +-
 tests/Monolog/Handler/HandlerWrapperTest.php         | 2 +-
 tests/Monolog/Handler/NativeMailerHandlerTest.php    | 2 +-
 tests/Monolog/Handler/NewRelicHandlerTest.php        | 2 +-
 tests/Monolog/Handler/PHPConsoleHandlerTest.php      | 2 +-
 tests/Monolog/Handler/RavenHandlerTest.php           | 2 +-
 tests/Monolog/Handler/RollbarHandlerTest.php         | 2 +-
 tests/Monolog/Handler/RotatingFileHandlerTest.php    | 4 ++--
 tests/Monolog/Handler/Slack/SlackRecordTest.php      | 2 +-
 tests/Monolog/Handler/SlackHandlerTest.php           | 2 +-
 tests/Monolog/Handler/SwiftMailerHandlerTest.php     | 2 +-
 tests/Monolog/Handler/ZendMonitorHandlerTest.php     | 2 +-
 tests/Monolog/RegistryTest.php                       | 2 +-
 tests/Monolog/SignalHandlerTest.php                  | 4 ++--
 31 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/tests/Monolog/Formatter/ElasticaFormatterTest.php b/tests/Monolog/Formatter/ElasticaFormatterTest.php
index 03f63e7..e886800 100644
--- a/tests/Monolog/Formatter/ElasticaFormatterTest.php
+++ b/tests/Monolog/Formatter/ElasticaFormatterTest.php
@@ -15,7 +15,7 @@ use Monolog\Logger;
 
 class ElasticaFormatterTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists("Elastica\Document")) {
             $this->markTestSkipped("ruflin/elastica not installed");
diff --git a/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
index fe816df..0cae9f7 100644
--- a/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+++ b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
@@ -15,7 +15,7 @@ use Monolog\Logger;
 
 class GelfMessageFormatterTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('\Gelf\Message')) {
             $this->markTestSkipped("graylog2/gelf-php or mlehner/gelf-php is not installed");
diff --git a/tests/Monolog/Formatter/LogstashFormatterTest.php b/tests/Monolog/Formatter/LogstashFormatterTest.php
index e4cd7b7..3174f2c 100644
--- a/tests/Monolog/Formatter/LogstashFormatterTest.php
+++ b/tests/Monolog/Formatter/LogstashFormatterTest.php
@@ -13,17 +13,9 @@ namespace Monolog\Formatter;
 
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Error\Warning;
 
 class LogstashFormatterTest extends TestCase
 {
-    public function tearDown()
-    {
-        Warning::$enabled = true;
-
-        return parent::tearDown();
-    }
-
     /**
      * @covers Monolog\Formatter\LogstashFormatter::format
      */
diff --git a/tests/Monolog/Formatter/MongoDBFormatterTest.php b/tests/Monolog/Formatter/MongoDBFormatterTest.php
index 2ce6142..32f4c76 100644
--- a/tests/Monolog/Formatter/MongoDBFormatterTest.php
+++ b/tests/Monolog/Formatter/MongoDBFormatterTest.php
@@ -18,7 +18,7 @@ use Monolog\Logger;
  */
 class MongoDBFormatterTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('MongoDate')) {
             $this->markTestSkipped('mongo extension not installed');
diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php
index 1ec98be..a93401d 100644
--- a/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php
@@ -12,20 +12,12 @@
 namespace Monolog\Formatter;
 
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Error\Warning;
 
 /**
  * @covers Monolog\Formatter\NormalizerFormatter
  */
 class NormalizerFormatterTest extends TestCase
 {
-    public function tearDown()
-    {
-        Warning::$enabled = true;
-
-        return parent::tearDown();
-    }
-
     public function testFormat()
     {
         $formatter = new NormalizerFormatter('Y-m-d');
diff --git a/tests/Monolog/Formatter/ScalarFormatterTest.php b/tests/Monolog/Formatter/ScalarFormatterTest.php
index e396bb5..b70e685 100644
--- a/tests/Monolog/Formatter/ScalarFormatterTest.php
+++ b/tests/Monolog/Formatter/ScalarFormatterTest.php
@@ -15,7 +15,7 @@ class ScalarFormatterTest extends \PHPUnit\Framework\TestCase
 {
     private $formatter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->formatter = new ScalarFormatter();
     }
diff --git a/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
index 1d526c7..2ca99ee 100644
--- a/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
+++ b/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
@@ -19,7 +19,7 @@ use Monolog\Logger;
  */
 class BrowserConsoleHandlerTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         BrowserConsoleHandler::resetStatic();
     }
diff --git a/tests/Monolog/Handler/ChromePHPHandlerTest.php b/tests/Monolog/Handler/ChromePHPHandlerTest.php
index bb1b079..a78cd90 100644
--- a/tests/Monolog/Handler/ChromePHPHandlerTest.php
+++ b/tests/Monolog/Handler/ChromePHPHandlerTest.php
@@ -19,7 +19,7 @@ use Monolog\Logger;
  */
 class ChromePHPHandlerTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         TestChromePHPHandler::resetStatic();
         $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0';
diff --git a/tests/Monolog/Handler/DeduplicationHandlerTest.php b/tests/Monolog/Handler/DeduplicationHandlerTest.php
index e2aff86..65490de 100644
--- a/tests/Monolog/Handler/DeduplicationHandlerTest.php
+++ b/tests/Monolog/Handler/DeduplicationHandlerTest.php
@@ -158,7 +158,7 @@ class DeduplicationHandlerTest extends TestCase
         $this->assertFalse($test->hasWarningRecords());
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         @unlink(sys_get_temp_dir().'/monolog_dedup.log');
     }
diff --git a/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
index d67da90..aae3092 100644
--- a/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
+++ b/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
@@ -16,7 +16,7 @@ use Monolog\Logger;
 
 class DoctrineCouchDBHandlerTest extends TestCase
 {
-    protected function setup()
+    protected function setup(): void
     {
         if (!class_exists('Doctrine\CouchDB\CouchDBClient')) {
             $this->markTestSkipped('The "doctrine/couchdb" package is not installed');
diff --git a/tests/Monolog/Handler/DynamoDbHandlerTest.php b/tests/Monolog/Handler/DynamoDbHandlerTest.php
index 2e6c348..8f2c8a2 100644
--- a/tests/Monolog/Handler/DynamoDbHandlerTest.php
+++ b/tests/Monolog/Handler/DynamoDbHandlerTest.php
@@ -17,7 +17,7 @@ class DynamoDbHandlerTest extends TestCase
 {
     private $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('Aws\DynamoDb\DynamoDbClient')) {
             $this->markTestSkipped('aws/aws-sdk-php not installed');
diff --git a/tests/Monolog/Handler/ElasticSearchHandlerTest.php b/tests/Monolog/Handler/ElasticSearchHandlerTest.php
index 1687074..512c720 100644
--- a/tests/Monolog/Handler/ElasticSearchHandlerTest.php
+++ b/tests/Monolog/Handler/ElasticSearchHandlerTest.php
@@ -34,7 +34,7 @@ class ElasticSearchHandlerTest extends TestCase
         'type'  => 'doc_type',
     );
 
-    public function setUp()
+    public function setUp(): void
     {
         // Elastica lib required
         if (!class_exists("Elastica\Client")) {
diff --git a/tests/Monolog/Handler/ErrorLogHandlerTest.php b/tests/Monolog/Handler/ErrorLogHandlerTest.php
index 99785cb..bbd1aba 100644
--- a/tests/Monolog/Handler/ErrorLogHandlerTest.php
+++ b/tests/Monolog/Handler/ErrorLogHandlerTest.php
@@ -22,7 +22,7 @@ function error_log()
 
 class ErrorLogHandlerTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $GLOBALS['error_log'] = array();
     }
diff --git a/tests/Monolog/Handler/FirePHPHandlerTest.php b/tests/Monolog/Handler/FirePHPHandlerTest.php
index 7a404e6..93015dd 100644
--- a/tests/Monolog/Handler/FirePHPHandlerTest.php
+++ b/tests/Monolog/Handler/FirePHPHandlerTest.php
@@ -19,7 +19,7 @@ use Monolog\Logger;
  */
 class FirePHPHandlerTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         TestFirePHPHandler::resetStatic();
         $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0';
diff --git a/tests/Monolog/Handler/FleepHookHandlerTest.php b/tests/Monolog/Handler/FleepHookHandlerTest.php
index 91cdd31..ba6e0fb 100644
--- a/tests/Monolog/Handler/FleepHookHandlerTest.php
+++ b/tests/Monolog/Handler/FleepHookHandlerTest.php
@@ -30,7 +30,7 @@ class FleepHookHandlerTest extends TestCase
      */
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Monolog/Handler/FlowdockHandlerTest.php b/tests/Monolog/Handler/FlowdockHandlerTest.php
index 4b120d5..0bd2441 100644
--- a/tests/Monolog/Handler/FlowdockHandlerTest.php
+++ b/tests/Monolog/Handler/FlowdockHandlerTest.php
@@ -31,7 +31,7 @@ class FlowdockHandlerTest extends TestCase
      */
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!extension_loaded('openssl')) {
             $this->markTestSkipped('This test requires openssl to run');
diff --git a/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/tests/Monolog/Handler/GelfHandlerLegacyTest.php
index 9d007b1..ee2738c 100644
--- a/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+++ b/tests/Monolog/Handler/GelfHandlerLegacyTest.php
@@ -18,7 +18,7 @@ use Monolog\Formatter\GelfMessageFormatter;
 
 class GelfHandlerLegacyTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) {
             $this->markTestSkipped("mlehner/gelf-php not installed");
diff --git a/tests/Monolog/Handler/GelfHandlerTest.php b/tests/Monolog/Handler/GelfHandlerTest.php
index 8cdd64f..44f386f 100644
--- a/tests/Monolog/Handler/GelfHandlerTest.php
+++ b/tests/Monolog/Handler/GelfHandlerTest.php
@@ -18,7 +18,7 @@ use Monolog\Formatter\GelfMessageFormatter;
 
 class GelfHandlerTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('Gelf\Publisher') || !class_exists('Gelf\Message')) {
             $this->markTestSkipped("graylog2/gelf-php not installed");
diff --git a/tests/Monolog/Handler/HandlerWrapperTest.php b/tests/Monolog/Handler/HandlerWrapperTest.php
index d8d0452..9354a20 100644
--- a/tests/Monolog/Handler/HandlerWrapperTest.php
+++ b/tests/Monolog/Handler/HandlerWrapperTest.php
@@ -25,7 +25,7 @@ class HandlerWrapperTest extends TestCase
 
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->handler = $this->getMock('Monolog\\Handler\\HandlerInterface');
diff --git a/tests/Monolog/Handler/NativeMailerHandlerTest.php b/tests/Monolog/Handler/NativeMailerHandlerTest.php
index ddf545d..d9087ce 100644
--- a/tests/Monolog/Handler/NativeMailerHandlerTest.php
+++ b/tests/Monolog/Handler/NativeMailerHandlerTest.php
@@ -22,7 +22,7 @@ function mail($to, $subject, $message, $additional_headers = null, $additional_p
 
 class NativeMailerHandlerTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $GLOBALS['mail'] = array();
     }
diff --git a/tests/Monolog/Handler/NewRelicHandlerTest.php b/tests/Monolog/Handler/NewRelicHandlerTest.php
index 4d3a615..96bba32 100644
--- a/tests/Monolog/Handler/NewRelicHandlerTest.php
+++ b/tests/Monolog/Handler/NewRelicHandlerTest.php
@@ -21,7 +21,7 @@ class NewRelicHandlerTest extends TestCase
     public static $customParameters;
     public static $transactionName;
 
-    public function setUp()
+    public function setUp(): void
     {
         self::$appname = null;
         self::$customParameters = array();
diff --git a/tests/Monolog/Handler/PHPConsoleHandlerTest.php b/tests/Monolog/Handler/PHPConsoleHandlerTest.php
index 152573e..10f3aee 100644
--- a/tests/Monolog/Handler/PHPConsoleHandlerTest.php
+++ b/tests/Monolog/Handler/PHPConsoleHandlerTest.php
@@ -34,7 +34,7 @@ class PHPConsoleHandlerTest extends TestCase
     /** @var  ErrorDispatcher|PHPUnit_Framework_MockObject_MockObject */
     protected $errorDispatcher;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!class_exists('PhpConsole\Connector')) {
             $this->markTestSkipped('PHP Console library not found. See https://github.com/barbushin/php-console#installation');
diff --git a/tests/Monolog/Handler/RavenHandlerTest.php b/tests/Monolog/Handler/RavenHandlerTest.php
index 26d212b..568f182 100644
--- a/tests/Monolog/Handler/RavenHandlerTest.php
+++ b/tests/Monolog/Handler/RavenHandlerTest.php
@@ -17,7 +17,7 @@ use Monolog\Formatter\LineFormatter;
 
 class RavenHandlerTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('Raven_Client')) {
             $this->markTestSkipped('raven/raven not installed');
diff --git a/tests/Monolog/Handler/RollbarHandlerTest.php b/tests/Monolog/Handler/RollbarHandlerTest.php
index f302e91..57a6270 100644
--- a/tests/Monolog/Handler/RollbarHandlerTest.php
+++ b/tests/Monolog/Handler/RollbarHandlerTest.php
@@ -34,7 +34,7 @@ class RollbarHandlerTest extends TestCase
      */
     public $reportedExceptionArguments = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Monolog/Handler/RotatingFileHandlerTest.php b/tests/Monolog/Handler/RotatingFileHandlerTest.php
index c6f5fac..e64c76c 100644
--- a/tests/Monolog/Handler/RotatingFileHandlerTest.php
+++ b/tests/Monolog/Handler/RotatingFileHandlerTest.php
@@ -27,7 +27,7 @@ class RotatingFileHandlerTest extends TestCase
      */
     public $lastError;
 
-    public function setUp()
+    public function setUp(): void
     {
         $dir = __DIR__.'/Fixtures';
         chmod($dir, 0777);
@@ -235,7 +235,7 @@ class RotatingFileHandlerTest extends TestCase
         $this->assertEquals('footest', file_get_contents($log));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         foreach (glob(__DIR__.'/Fixtures/*.rot') as $file) {
             unlink($file);
diff --git a/tests/Monolog/Handler/Slack/SlackRecordTest.php b/tests/Monolog/Handler/Slack/SlackRecordTest.php
index b9de736..c353694 100644
--- a/tests/Monolog/Handler/Slack/SlackRecordTest.php
+++ b/tests/Monolog/Handler/Slack/SlackRecordTest.php
@@ -21,7 +21,7 @@ class SlackRecordTest extends TestCase
 {
     private $jsonPrettyPrintFlag;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
     }
diff --git a/tests/Monolog/Handler/SlackHandlerTest.php b/tests/Monolog/Handler/SlackHandlerTest.php
index b12b01f..de8374c 100644
--- a/tests/Monolog/Handler/SlackHandlerTest.php
+++ b/tests/Monolog/Handler/SlackHandlerTest.php
@@ -32,7 +32,7 @@ class SlackHandlerTest extends TestCase
      */
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!extension_loaded('openssl')) {
             $this->markTestSkipped('This test requires openssl to run');
diff --git a/tests/Monolog/Handler/SwiftMailerHandlerTest.php b/tests/Monolog/Handler/SwiftMailerHandlerTest.php
index 1d62940..0ca722d 100644
--- a/tests/Monolog/Handler/SwiftMailerHandlerTest.php
+++ b/tests/Monolog/Handler/SwiftMailerHandlerTest.php
@@ -19,7 +19,7 @@ class SwiftMailerHandlerTest extends TestCase
     /** @var \Swift_Mailer|\PHPUnit_Framework_MockObject_MockObject */
     private $mailer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->mailer = $this
             ->getMockBuilder('Swift_Mailer')
diff --git a/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/tests/Monolog/Handler/ZendMonitorHandlerTest.php
index 57e1633..3d15258 100644
--- a/tests/Monolog/Handler/ZendMonitorHandlerTest.php
+++ b/tests/Monolog/Handler/ZendMonitorHandlerTest.php
@@ -17,7 +17,7 @@ class ZendMonitorHandlerTest extends TestCase
 {
     protected $zendMonitorHandler;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!function_exists('zend_monitor_custom_event')) {
             $this->markTestSkipped('ZendServer is not installed');
diff --git a/tests/Monolog/RegistryTest.php b/tests/Monolog/RegistryTest.php
index 13016f4..3742b63 100644
--- a/tests/Monolog/RegistryTest.php
+++ b/tests/Monolog/RegistryTest.php
@@ -13,7 +13,7 @@ namespace Monolog;
 
 class RegistryTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         Registry::clear();
     }
diff --git a/tests/Monolog/SignalHandlerTest.php b/tests/Monolog/SignalHandlerTest.php
index 9fa0792..7a1e7ea 100644
--- a/tests/Monolog/SignalHandlerTest.php
+++ b/tests/Monolog/SignalHandlerTest.php
@@ -26,7 +26,7 @@ class SignalHandlerTest extends TestCase
     private $blockedSignals;
     private $signalHandlers;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->signalHandlers = array();
         if (extension_loaded('pcntl')) {
@@ -39,7 +39,7 @@ class SignalHandlerTest extends TestCase
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->asyncSignalHandling !== null) {
             pcntl_async_signals($this->asyncSignalHandling);