Merge branch '7.2RC'7.2

10 files changed, 58 insertions, 171 deletions

diff --git a/vendor/psr/log/Psr/Log/AbstractLogger.php b/vendor/psr/log/Psr/Log/AbstractLogger.php
deleted file mode 100644
index e02f9daf3..000000000
--- a/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * This is a simple Logger implementation that other Loggers can inherit from.
- *
- * It simply delegates all log-level-specific methods to the `log` method to
- * reduce boilerplate code that a simple Logger that does the same thing with
- * messages regardless of the error level has to implement.
- */
-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);
-    }
-}
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
index ca0569537..f3f066719 100644
--- a/vendor/psr/log/composer.json
+++ b/vendor/psr/log/composer.json
@@ -11,16 +11,16 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=8.0.0"
     },
     "autoload": {
         "psr-4": {
-            "Psr\\Log\\": "Psr/Log/"
+            "Psr\\Log\\": "src"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }
diff --git a/vendor/psr/log/src/AbstractLogger.php b/vendor/psr/log/src/AbstractLogger.php
new file mode 100644
index 000000000..d60a091af
--- /dev/null
+++ b/vendor/psr/log/src/AbstractLogger.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    use LoggerTrait;
+}
diff --git a/vendor/psr/log/Psr/Log/InvalidArgumentException.php b/vendor/psr/log/src/InvalidArgumentException.php
index 67f852d1d..67f852d1d 100644
--- a/vendor/psr/log/Psr/Log/InvalidArgumentException.php
+++ b/vendor/psr/log/src/InvalidArgumentException.php
diff --git a/vendor/psr/log/Psr/Log/LogLevel.php b/vendor/psr/log/src/LogLevel.php
index 9cebcace6..9cebcace6 100644
--- a/vendor/psr/log/Psr/Log/LogLevel.php
+++ b/vendor/psr/log/src/LogLevel.php
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/vendor/psr/log/src/LoggerAwareInterface.php
index 4d64f4786..4d64f4786 100644
--- a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
+++ b/vendor/psr/log/src/LoggerAwareInterface.php
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/src/LoggerAwareTrait.php
index 82bf45c89..5f1553a4c 100644
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/vendor/psr/log/src/LoggerAwareTrait.php
@@ -12,7 +12,7 @@ trait LoggerAwareTrait
      *
      * @var LoggerInterface|null
      */
-    protected $logger;
+    protected ?LoggerInterface $logger = null;
 
     /**
      * Sets a logger.
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/src/LoggerInterface.php
index 2206cfde4..b4d062b9b 100644
--- a/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ b/vendor/psr/log/src/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 @@ interface LoggerInterface
      * 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 @@ interface LoggerInterface
      * 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/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/src/LoggerTrait.php
index e392fef0a..920bda77f 100644
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ b/vendor/psr/log/src/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 @@ trait LoggerTrait
      * 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 @@ trait LoggerTrait
      *
      * 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 @@ trait LoggerTrait
      * 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 @@ trait LoggerTrait
      * 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 @@ trait LoggerTrait
     /**
      * 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 @@ trait LoggerTrait
      *
      * 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 @@ trait LoggerTrait
     /**
      * 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 @@ trait LoggerTrait
      * 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/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/src/NullLogger.php
index c8f7293b1..560770571 100644
--- a/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/vendor/psr/log/src/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
     }