From c0816b80926ec578fe0bcf0d78328c4d0a93ca72 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 17 Dec 2021 09:19:16 +0100
Subject: [PATCH 1/4] PSR Log v3

---
 composer.json                             |  2 +-
 src/Illuminate/Broadcasting/composer.json |  2 +-
 src/Illuminate/Log/Logger.php             | 51 ++++++++++++-----------
 src/Illuminate/Mail/composer.json         |  2 +-
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/composer.json b/composer.json
index 2ca647e8a852..f64b81082c1f 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.53.1",
         "psr/container": "^1.1.1|^2.0.1",
-        "psr/log": "^1.0|^2.0",
+        "psr/log": "^3.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.2.2",
         "symfony/console": "^6.0",
diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json
index 60e2c6e3c987..1d193ae611be 100644
--- a/src/Illuminate/Broadcasting/composer.json
+++ b/src/Illuminate/Broadcasting/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^8.0.2",
         "ext-json": "*",
-        "psr/log": "^1.0|^2.0",
+        "psr/log": "^3.0",
         "illuminate/bus": "^9.0",
         "illuminate/collections": "^9.0",
         "illuminate/contracts": "^9.0",
diff --git a/src/Illuminate/Log/Logger.php b/src/Illuminate/Log/Logger.php
index 180159b5e85c..d604c4487f7e 100755
--- a/src/Illuminate/Log/Logger.php
+++ b/src/Illuminate/Log/Logger.php
@@ -9,6 +9,7 @@
 use Illuminate\Log\Events\MessageLogged;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use Stringable;
 
 class Logger implements LoggerInterface
 {
@@ -49,11 +50,11 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
     /**
      * Log an emergency message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function emergency($message, array $context = []): void
+    public function emergency(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -61,11 +62,11 @@ public function emergency($message, array $context = []): void
     /**
      * Log an alert message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function alert($message, array $context = []): void
+    public function alert(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -73,11 +74,11 @@ public function alert($message, array $context = []): void
     /**
      * Log a critical message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function critical($message, array $context = []): void
+    public function critical(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -85,11 +86,11 @@ public function critical($message, array $context = []): void
     /**
      * Log an error message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function error($message, array $context = []): void
+    public function error(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -97,11 +98,11 @@ public function error($message, array $context = []): void
     /**
      * Log a warning message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function warning($message, array $context = []): void
+    public function warning(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -109,11 +110,11 @@ public function warning($message, array $context = []): void
     /**
      * Log a notice to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function notice($message, array $context = []): void
+    public function notice(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -121,11 +122,11 @@ public function notice($message, array $context = []): void
     /**
      * Log an informational message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function info($message, array $context = []): void
+    public function info(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -133,11 +134,11 @@ public function info($message, array $context = []): void
     /**
      * Log a debug message to the logs.
      *
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function debug($message, array $context = []): void
+    public function debug(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -146,11 +147,11 @@ public function debug($message, array $context = []): void
      * Log a message to the logs.
      *
      * @param  string  $level
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function log($level, $message, array $context = []): void
+    public function log($level, string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }
@@ -159,11 +160,11 @@ public function log($level, $message, array $context = []): void
      * Dynamically pass log calls into the writer.
      *
      * @param  string  $level
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    public function write($level, $message, array $context = []): void
+    public function write($level, string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }
@@ -172,11 +173,11 @@ public function write($level, $message, array $context = []): void
      * Write a message to the log.
      *
      * @param  string  $level
-     * @param  string  $message
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
      * @param  array  $context
      * @return void
      */
-    protected function writeLog($level, $message, $context)
+    protected function writeLog($level, string|\Stringable|array|Arrayable|Jsonable $message, $context): void
     {
         $this->logger->{$level}(
             $message = $this->formatMessage($message),
@@ -249,8 +250,8 @@ protected function fireLogEvent($level, $message, array $context = [])
     /**
      * Format the parameters for the logger.
      *
-     * @param  mixed  $message
-     * @return mixed
+     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @return string
      */
     protected function formatMessage($message)
     {
@@ -262,7 +263,7 @@ protected function formatMessage($message)
             return var_export($message->toArray(), true);
         }
 
-        return $message;
+        return (string) $message;
     }
 
     /**
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
index 91527cdbae0f..b1c4d3d14ecc 100755
--- a/src/Illuminate/Mail/composer.json
+++ b/src/Illuminate/Mail/composer.json
@@ -22,7 +22,7 @@
         "illuminate/macroable": "^9.0",
         "illuminate/support": "^9.0",
         "league/commonmark": "^2.0.2",
-        "psr/log": "^1.0|^2.0",
+        "psr/log": "^3.0",
         "symfony/mailer": "^6.0",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"
     },

From 9a4c78f2a96d1cc2f263504eb4cfad66a53cdb36 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@users.noreply.github.com>
Date: Fri, 17 Dec 2021 08:21:13 +0000
Subject: [PATCH 2/4] Apply fixes from StyleCI

---
 src/Illuminate/Log/Logger.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Illuminate/Log/Logger.php b/src/Illuminate/Log/Logger.php
index d604c4487f7e..df78b1cadb2f 100755
--- a/src/Illuminate/Log/Logger.php
+++ b/src/Illuminate/Log/Logger.php
@@ -9,7 +9,6 @@
 use Illuminate\Log\Events\MessageLogged;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
-use Stringable;
 
 class Logger implements LoggerInterface
 {

From 9a9407894b6ebb2db3b42f9469df4586e1e317ee Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 17 Dec 2021 09:44:58 +0100
Subject: [PATCH 3/4] Re-add support for psr/log v2

---
 composer.json                             | 2 +-
 src/Illuminate/Broadcasting/composer.json | 2 +-
 src/Illuminate/Mail/composer.json         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index f64b81082c1f..780068ce46a3 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.53.1",
         "psr/container": "^1.1.1|^2.0.1",
-        "psr/log": "^3.0",
+        "psr/log": "^2.0|^3.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.2.2",
         "symfony/console": "^6.0",
diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json
index 1d193ae611be..6351a124f2a3 100644
--- a/src/Illuminate/Broadcasting/composer.json
+++ b/src/Illuminate/Broadcasting/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^8.0.2",
         "ext-json": "*",
-        "psr/log": "^3.0",
+        "psr/log": "^2.0|^3.0",
         "illuminate/bus": "^9.0",
         "illuminate/collections": "^9.0",
         "illuminate/contracts": "^9.0",
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
index b1c4d3d14ecc..4152c6599f04 100755
--- a/src/Illuminate/Mail/composer.json
+++ b/src/Illuminate/Mail/composer.json
@@ -22,7 +22,7 @@
         "illuminate/macroable": "^9.0",
         "illuminate/support": "^9.0",
         "league/commonmark": "^2.0.2",
-        "psr/log": "^3.0",
+        "psr/log": "^2.0|^3.0",
         "symfony/mailer": "^6.0",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"
     },

From 9ba80db652efefcc6d10e18d9e2e20556b6f1186 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Fri, 17 Dec 2021 08:44:58 -0600
Subject: [PATCH 4/4] formatting

---
 src/Illuminate/Log/Logger.php | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Illuminate/Log/Logger.php b/src/Illuminate/Log/Logger.php
index df78b1cadb2f..08e3cff54ef9 100755
--- a/src/Illuminate/Log/Logger.php
+++ b/src/Illuminate/Log/Logger.php
@@ -49,11 +49,11 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
     /**
      * Log an emergency message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function emergency(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function emergency(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -61,11 +61,11 @@ public function emergency(string|\Stringable|array|Arrayable|Jsonable $message,
     /**
      * Log an alert message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function alert(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function alert(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -73,11 +73,11 @@ public function alert(string|\Stringable|array|Arrayable|Jsonable $message, arra
     /**
      * Log a critical message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function critical(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function critical(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -85,11 +85,11 @@ public function critical(string|\Stringable|array|Arrayable|Jsonable $message, a
     /**
      * Log an error message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function error(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function error(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -97,11 +97,11 @@ public function error(string|\Stringable|array|Arrayable|Jsonable $message, arra
     /**
      * Log a warning message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function warning(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function warning(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -109,11 +109,11 @@ public function warning(string|\Stringable|array|Arrayable|Jsonable $message, ar
     /**
      * Log a notice to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function notice(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function notice(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -121,11 +121,11 @@ public function notice(string|\Stringable|array|Arrayable|Jsonable $message, arr
     /**
      * Log an informational message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function info(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function info(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -133,11 +133,11 @@ public function info(string|\Stringable|array|Arrayable|Jsonable $message, array
     /**
      * Log a debug message to the logs.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function debug(string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function debug(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -146,11 +146,11 @@ public function debug(string|\Stringable|array|Arrayable|Jsonable $message, arra
      * Log a message to the logs.
      *
      * @param  string  $level
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function log($level, string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function log($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }
@@ -159,11 +159,11 @@ public function log($level, string|\Stringable|array|Arrayable|Jsonable $message
      * Dynamically pass log calls into the writer.
      *
      * @param  string  $level
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    public function write($level, string|\Stringable|array|Arrayable|Jsonable $message, array $context = []): void
+    public function write($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }
@@ -172,11 +172,11 @@ public function write($level, string|\Stringable|array|Arrayable|Jsonable $messa
      * Write a message to the log.
      *
      * @param  string  $level
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @param  array  $context
      * @return void
      */
-    protected function writeLog($level, string|\Stringable|array|Arrayable|Jsonable $message, $context): void
+    protected function writeLog($level, Arrayable|Jsonable|\Stringable|array|string $message, $context): void
     {
         $this->logger->{$level}(
             $message = $this->formatMessage($message),
@@ -249,7 +249,7 @@ protected function fireLogEvent($level, $message, array $context = [])
     /**
      * Format the parameters for the logger.
      *
-     * @param  string|\Stringable|array|Arrayable|Jsonable  $message
+     * @param  Arrayable|Jsonable|\Stringable|array|string  $message
      * @return string
      */
     protected function formatMessage($message)