From dddc7ed781145a4846076fc2a135bb35c9c3882a Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 4 Nov 2018 19:58:13 +0100
Subject: [PATCH] Fix some resettableinterface usages

---
 src/Monolog/ErrorHandler.php                      |  1 -
 src/Monolog/Handler/AbstractHandler.php           |  8 +++++++-
 src/Monolog/Handler/AbstractProcessingHandler.php |  4 ++--
 src/Monolog/Handler/BrowserConsoleHandler.php     |  3 +++
 src/Monolog/Handler/FingersCrossedHandler.php     |  4 +---
 src/Monolog/Handler/GroupHandler.php              | 13 ++++++++++---
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php
index 317494a8..7447f279 100644
--- a/src/Monolog/ErrorHandler.php
+++ b/src/Monolog/ErrorHandler.php
@@ -13,7 +13,6 @@ namespace Monolog;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
-use Monolog\Registry;
 
 /**
  * Monolog error handler
diff --git a/src/Monolog/Handler/AbstractHandler.php b/src/Monolog/Handler/AbstractHandler.php
index 7c507466..da5bbc05 100644
--- a/src/Monolog/Handler/AbstractHandler.php
+++ b/src/Monolog/Handler/AbstractHandler.php
@@ -12,13 +12,14 @@
 namespace Monolog\Handler;
 
 use Monolog\Logger;
+use Monolog\ResettableInterface;
 
 /**
  * Base Handler class providing basic level/bubble support
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
-abstract class AbstractHandler extends Handler
+abstract class AbstractHandler extends Handler implements ResettableInterface
 {
     protected $level = Logger::DEBUG;
     protected $bubble = true;
@@ -88,4 +89,9 @@ abstract class AbstractHandler extends Handler
     {
         return $this->bubble;
     }
+
+    public function reset()
+    {
+        $this->close();
+    }
 }
diff --git a/src/Monolog/Handler/AbstractProcessingHandler.php b/src/Monolog/Handler/AbstractProcessingHandler.php
index 5e9e5837..b9da8985 100644
--- a/src/Monolog/Handler/AbstractProcessingHandler.php
+++ b/src/Monolog/Handler/AbstractProcessingHandler.php
@@ -21,7 +21,7 @@ use Monolog\ResettableInterface;
  * @author Jordi Boggiano <j.boggiano@seld.be>
  * @author Christophe Coevoet <stof@notk.org>
  */
-abstract class AbstractProcessingHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface, ResettableInterface
+abstract class AbstractProcessingHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface
 {
     use ProcessableHandlerTrait;
     use FormattableHandlerTrait;
@@ -53,7 +53,7 @@ abstract class AbstractProcessingHandler extends AbstractHandler implements Proc
 
     public function reset()
     {
-        $this->close();
+        parent::reset();
 
         foreach ($this->processors as $processor) {
             if ($processor instanceof ResettableInterface) {
diff --git a/src/Monolog/Handler/BrowserConsoleHandler.php b/src/Monolog/Handler/BrowserConsoleHandler.php
index a39b0582..dc12b653 100755
--- a/src/Monolog/Handler/BrowserConsoleHandler.php
+++ b/src/Monolog/Handler/BrowserConsoleHandler.php
@@ -13,6 +13,7 @@ namespace Monolog\Handler;
 
 use Monolog\Formatter\LineFormatter;
 use Monolog\Formatter\FormatterInterface;
+use Monolog\ResettableInterface;
 
 /**
  * Handler sending logs to browser's javascript console with no browser extension required
@@ -76,6 +77,8 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
 
     public function reset()
     {
+        parent::reset();
+
         self::resetStatic();
     }
 
diff --git a/src/Monolog/Handler/FingersCrossedHandler.php b/src/Monolog/Handler/FingersCrossedHandler.php
index 305396ff..90727a04 100644
--- a/src/Monolog/Handler/FingersCrossedHandler.php
+++ b/src/Monolog/Handler/FingersCrossedHandler.php
@@ -28,7 +28,7 @@ use Monolog\ResettableInterface;
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
-class FingersCrossedHandler extends Handler implements ProcessableHandlerInterface
+class FingersCrossedHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface
 {
     use ProcessableHandlerTrait;
 
@@ -148,8 +148,6 @@ class FingersCrossedHandler extends Handler implements ProcessableHandlerInterfa
      */
     public function reset()
     {
-        parent::reset();
-
         $this->buffer = array();
         $this->buffering = true;
 
diff --git a/src/Monolog/Handler/GroupHandler.php b/src/Monolog/Handler/GroupHandler.php
index 17090311..3c400631 100644
--- a/src/Monolog/Handler/GroupHandler.php
+++ b/src/Monolog/Handler/GroupHandler.php
@@ -19,7 +19,7 @@ use Monolog\ResettableInterface;
  *
  * @author Lenar Lõhmus <lenar@city.ee>
  */
-class GroupHandler extends Handler implements ProcessableHandlerInterface
+class GroupHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface
 {
     use ProcessableHandlerTrait;
 
@@ -93,8 +93,6 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface
 
     public function reset()
     {
-        parent::reset();
-
         foreach ($this->handlers as $handler) {
             if ($handler instanceof ResettableInterface) {
                 $handler->reset();
@@ -102,6 +100,15 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface
         }
     }
 
+    public function close()
+    {
+        parent::close();
+
+        foreach ($this->handlers as $handler) {
+            $handler->close();
+        }
+    }
+
     /**
      * {@inheritdoc}
      */