From 3b2593b04c621d52e171f058cf891631b4c54353 Mon Sep 17 00:00:00 2001
From: Julien Rosset <julien.rosset@solulog.fr>
Date: Fri, 9 Jun 2023 12:56:01 +0200
Subject: [PATCH] Compatibility with PHP:^8.1 and monolog:^3.3

---
 composer.json                                    | 10 +++++-----
 src/ExtendedMonolog/ExceptionLogger.php          |  3 ++-
 src/ExtendedMonolog/ExceptionLoggerInterface.php |  5 +++--
 src/ExtendedMonolog/LogDirectoryHandler.php      |  4 ++--
 tests/test.php                                   |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 395d962..3332e0f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,18 +7,18 @@
     "config":            {
         "sort-packages": true
     },
-    "extra":             {
+    "extra":   {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     },
 
     "minimum-stability": "stable",
-    "require":           {
-        "php":                        "^7.4 || ^8.0",
+    "require": {
+        "php":                        "^8.1",
         "jrosset/exceptionhelper":    "^1.0",
         "jrosset/lasterrorexception": "^1.0",
-        "monolog/monolog":            "^2.9"
+        "monolog/monolog":            "^3.3"
     },
     "autoload":          {
         "psr-4":                 {
diff --git a/src/ExtendedMonolog/ExceptionLogger.php b/src/ExtendedMonolog/ExceptionLogger.php
index 4bee884..6847baa 100644
--- a/src/ExtendedMonolog/ExceptionLogger.php
+++ b/src/ExtendedMonolog/ExceptionLogger.php
@@ -3,6 +3,7 @@
 namespace jrosset\ExtendedMonolog;
 
 use jrosset\ExceptionHelper\ExceptionHelper;
+use Monolog\Level;
 use Monolog\Logger;
 use Throwable;
 
@@ -13,7 +14,7 @@ class ExceptionLogger extends Logger implements ExceptionLoggerInterface {
     /**
      * @inheritDoc
      */
-    public function exception (int $level, Throwable $exception, array $context = []): void {
+    public function exception (Level|int $level, Throwable $exception, array $context = []): void {
         $this->addRecord(
             $level,
             ExceptionHelper::toString($exception, false),
diff --git a/src/ExtendedMonolog/ExceptionLoggerInterface.php b/src/ExtendedMonolog/ExceptionLoggerInterface.php
index 5ca7805..86fa78f 100644
--- a/src/ExtendedMonolog/ExceptionLoggerInterface.php
+++ b/src/ExtendedMonolog/ExceptionLoggerInterface.php
@@ -2,6 +2,7 @@
 
 namespace jrosset\ExtendedMonolog;
 
+use Monolog\Level;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -12,9 +13,9 @@ interface ExceptionLoggerInterface extends LoggerInterface {
     /**
      * Adds a log record about an exception
      *
-     * @param int       $level     The logging level (a Monolog or RFC 5424 level)
+     * @param Level|int $level     The logging level (a Monolog or RFC 5424 level)
      * @param Throwable $exception The exception
      * @param array     $context   The log context
      */
-    public function exception (int $level, Throwable $exception, array $context = []): void;
+    public function exception (Level|int $level, Throwable $exception, array $context = []): void;
 }
\ No newline at end of file
diff --git a/src/ExtendedMonolog/LogDirectoryHandler.php b/src/ExtendedMonolog/LogDirectoryHandler.php
index 30edb78..fa9d811 100644
--- a/src/ExtendedMonolog/LogDirectoryHandler.php
+++ b/src/ExtendedMonolog/LogDirectoryHandler.php
@@ -7,7 +7,7 @@ use DateTimeImmutable;
 use DirectoryIterator;
 use jrosset\LastErrorException\LastErrorException;
 use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use Monolog\Level;
 use RuntimeException;
 use Throwable;
 
@@ -31,7 +31,7 @@ class LogDirectoryHandler extends StreamHandler {
      */
     public function __construct (
         string $dirPath,
-               $level = Logger::DEBUG,
+               $level = Level::Debug,
         int    $historyNumberOfDays = 30,
         bool   $bubble = true,
         ?int   $filePermission = null,
diff --git a/tests/test.php b/tests/test.php
index b8c08c6..f97342e 100644
--- a/tests/test.php
+++ b/tests/test.php
@@ -5,7 +5,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
 use jrosset\ExtendedMonolog\ExceptionLogger;
 use jrosset\ExtendedMonolog\LogDirectoryHandler;
 use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use Monolog\Level;
 
 /** @noinspection PhpUnhandledExceptionInspection */
 $logger = new ExceptionLogger(
@@ -25,5 +25,5 @@ try {
     $logger->info('END');
 }
 catch (Throwable $exception) {
-    $logger->exception(Logger::ERROR, $exception);
+    $logger->exception(Level::Error, $exception);
 }
\ No newline at end of file