From ec661ef8d02a3934ea4485827369eb2293ec64df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 24 Sep 2023 17:45:22 +0900
Subject: [PATCH] chore: update psr/log to v2.0

---
 composer.json                                 |   2 +-
 system/ComposerScripts.php                    |   3 +-
 system/ThirdParty/PSR/Log/AbstractLogger.php  | 115 +-----------------
 .../ThirdParty/PSR/Log/LoggerAwareTrait.php   |   2 +-
 system/ThirdParty/PSR/Log/LoggerInterface.php |  36 +++---
 system/ThirdParty/PSR/Log/LoggerTrait.php     |  36 +++---
 system/ThirdParty/PSR/Log/NullLogger.php      |   6 +-
 7 files changed, 43 insertions(+), 157 deletions(-)

diff --git a/composer.json b/composer.json
index 646f53d5c784..4affeb06bece 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "laminas/laminas-escaper": "^2.9",
-        "psr/log": "^1.1"
+        "psr/log": "^2.0"
     },
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index b95bdf54c4ae..021079da468d 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -56,7 +56,7 @@ final class ComposerScripts
         ],
         'psr-log' => [
             'license' => __DIR__ . '/../vendor/psr/log/LICENSE',
-            'from'    => __DIR__ . '/../vendor/psr/log/Psr/Log/',
+            'from'    => __DIR__ . '/../vendor/psr/log/src/',
             'to'      => __DIR__ . '/ThirdParty/PSR/Log/',
         ],
     ];
@@ -84,7 +84,6 @@ public static function postUpdate()
         }
 
         self::copyKintInitFiles();
-        self::recursiveDelete(self::$dependencies['psr-log']['to'] . 'Test/');
     }
 
     /**
diff --git a/system/ThirdParty/PSR/Log/AbstractLogger.php b/system/ThirdParty/PSR/Log/AbstractLogger.php
index e02f9daf3d51..d60a091affae 100644
--- a/system/ThirdParty/PSR/Log/AbstractLogger.php
+++ b/system/ThirdParty/PSR/Log/AbstractLogger.php
@@ -11,118 +11,5 @@
  */
 abstract class AbstractLogger implements LoggerInterface
 {
-    /**
-     * System is unusable.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function emergency($message, array $context = array())
-    {
-        $this->log(LogLevel::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function alert($message, array $context = array())
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function critical($message, array $context = array())
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function error($message, array $context = array())
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function warning($message, array $context = array())
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function notice($message, array $context = array())
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function info($message, array $context = array())
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function debug($message, array $context = array())
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
+    use LoggerTrait;
 }
diff --git a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
index 82bf45c89bab..5f1553a4c810 100644
--- a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
+++ b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
@@ -12,7 +12,7 @@ trait LoggerAwareTrait
      *
      * @var LoggerInterface|null
      */
-    protected $logger;
+    protected ?LoggerInterface $logger = null;
 
     /**
      * Sets a logger.
diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php
index 2206cfde41ae..b4d062b9b640 100644
--- a/system/ThirdParty/PSR/Log/LoggerInterface.php
+++ b/system/ThirdParty/PSR/Log/LoggerInterface.php
@@ -22,12 +22,12 @@ interface LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function emergency($message, array $context = array());
+    public function emergency(string|\Stringable $message, array $context = []);
 
     /**
      * Action must be taken immediately.
@@ -35,35 +35,35 @@ public function emergency($message, array $context = array());
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function alert($message, array $context = array());
+    public function alert(string|\Stringable $message, array $context = []);
 
     /**
      * Critical conditions.
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function critical($message, array $context = array());
+    public function critical(string|\Stringable $message, array $context = []);
 
     /**
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function error($message, array $context = array());
+    public function error(string|\Stringable $message, array $context = []);
 
     /**
      * Exceptional occurrences that are not errors.
@@ -71,55 +71,55 @@ public function error($message, array $context = array());
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function warning($message, array $context = array());
+    public function warning(string|\Stringable $message, array $context = []);
 
     /**
      * Normal but significant events.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function notice($message, array $context = array());
+    public function notice(string|\Stringable $message, array $context = []);
 
     /**
      * Interesting events.
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function info($message, array $context = array());
+    public function info(string|\Stringable $message, array $context = []);
 
     /**
      * Detailed debug information.
      *
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      */
-    public function debug($message, array $context = array());
+    public function debug(string|\Stringable $message, array $context = []);
 
     /**
      * Logs with an arbitrary level.
      *
      * @param mixed   $level
-     * @param string  $message
+     * @param string|\Stringable $message
      * @param mixed[] $context
      *
      * @return void
      *
      * @throws \Psr\Log\InvalidArgumentException
      */
-    public function log($level, $message, array $context = array());
+    public function log($level, string|\Stringable $message, array $context = []);
 }
diff --git a/system/ThirdParty/PSR/Log/LoggerTrait.php b/system/ThirdParty/PSR/Log/LoggerTrait.php
index e392fef0a0cb..920bda77f835 100644
--- a/system/ThirdParty/PSR/Log/LoggerTrait.php
+++ b/system/ThirdParty/PSR/Log/LoggerTrait.php
@@ -15,12 +15,12 @@ trait LoggerTrait
     /**
      * System is unusable.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function emergency($message, array $context = array())
+    public function emergency(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::EMERGENCY, $message, $context);
     }
@@ -31,12 +31,12 @@ public function emergency($message, array $context = array())
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function alert($message, array $context = array())
+    public function alert(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::ALERT, $message, $context);
     }
@@ -46,12 +46,12 @@ public function alert($message, array $context = array())
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function critical($message, array $context = array())
+    public function critical(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::CRITICAL, $message, $context);
     }
@@ -60,12 +60,12 @@ public function critical($message, array $context = array())
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function error($message, array $context = array())
+    public function error(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::ERROR, $message, $context);
     }
@@ -76,12 +76,12 @@ public function error($message, array $context = array())
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function warning($message, array $context = array())
+    public function warning(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::WARNING, $message, $context);
     }
@@ -89,12 +89,12 @@ public function warning($message, array $context = array())
     /**
      * Normal but significant events.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function notice($message, array $context = array())
+    public function notice(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::NOTICE, $message, $context);
     }
@@ -104,12 +104,12 @@ public function notice($message, array $context = array())
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function info($message, array $context = array())
+    public function info(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::INFO, $message, $context);
     }
@@ -117,12 +117,12 @@ public function info($message, array $context = array())
     /**
      * Detailed debug information.
      *
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      */
-    public function debug($message, array $context = array())
+    public function debug(string|\Stringable $message, array $context = [])
     {
         $this->log(LogLevel::DEBUG, $message, $context);
     }
@@ -131,12 +131,12 @@ public function debug($message, array $context = array())
      * Logs with an arbitrary level.
      *
      * @param mixed  $level
-     * @param string $message
+     * @param string|\Stringable $message
      * @param array  $context
      *
      * @return void
      *
      * @throws \Psr\Log\InvalidArgumentException
      */
-    abstract public function log($level, $message, array $context = array());
+    abstract public function log($level, string|\Stringable $message, array $context = []);
 }
diff --git a/system/ThirdParty/PSR/Log/NullLogger.php b/system/ThirdParty/PSR/Log/NullLogger.php
index c8f7293b1c66..56077057159d 100644
--- a/system/ThirdParty/PSR/Log/NullLogger.php
+++ b/system/ThirdParty/PSR/Log/NullLogger.php
@@ -16,14 +16,14 @@ class NullLogger extends AbstractLogger
      * Logs with an arbitrary level.
      *
      * @param mixed  $level
-     * @param string $message
-     * @param array  $context
+     * @param string|\Stringable $message
+     * @param array $context
      *
      * @return void
      *
      * @throws \Psr\Log\InvalidArgumentException
      */
-    public function log($level, $message, array $context = array())
+    public function log($level, string|\Stringable $message, array $context = [])
     {
         // noop
     }