From c07d7f1ed1468f4e697a48b506e964ecacebd8cc Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Sat, 25 Sep 2021 13:48:48 +0100
Subject: [PATCH 1/3] Revert "[9.x] Update psr/log version (#38852)"

This reverts commit 2b2420b501355047a43d8a11299b3b0cf79cf134.
---
 composer.json                     |  1 -
 src/Illuminate/Log/LogManager.php | 19 +++++++++----------
 src/Illuminate/Log/Logger.php     | 21 ++++++++++-----------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 70dec7e20de4..716c37d35290 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,6 @@
         "nesbot/carbon": "^2.31",
         "opis/closure": "^3.6",
         "psr/container": "^1.1.1|^2.0.1",
-        "psr/log": "^3.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.0",
         "symfony/console": "^6.0",
diff --git a/src/Illuminate/Log/LogManager.php b/src/Illuminate/Log/LogManager.php
index b7dbe5dcc444..a3f7f0afdeab 100644
--- a/src/Illuminate/Log/LogManager.php
+++ b/src/Illuminate/Log/LogManager.php
@@ -16,7 +16,6 @@
 use Monolog\Handler\WhatFailureGroupHandler;
 use Monolog\Logger as Monolog;
 use Psr\Log\LoggerInterface;
-use Stringable;
 use Throwable;
 
 class LogManager implements LoggerInterface
@@ -522,7 +521,7 @@ protected function parseDriver($driver)
      * @param  array  $context
      * @return void
      */
-    public function emergency(string|Stringable $message, array $context = []): void
+    public function emergency($message, array $context = [])
     {
         $this->driver()->emergency($message, $context);
     }
@@ -537,7 +536,7 @@ public function emergency(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function alert(string|Stringable $message, array $context = []): void
+    public function alert($message, array $context = [])
     {
         $this->driver()->alert($message, $context);
     }
@@ -551,7 +550,7 @@ public function alert(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function critical(string|Stringable $message, array $context = []): void
+    public function critical($message, array $context = [])
     {
         $this->driver()->critical($message, $context);
     }
@@ -564,7 +563,7 @@ public function critical(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function error(string|Stringable $message, array $context = []): void
+    public function error($message, array $context = [])
     {
         $this->driver()->error($message, $context);
     }
@@ -579,7 +578,7 @@ public function error(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function warning(string|Stringable $message, array $context = []): void
+    public function warning($message, array $context = [])
     {
         $this->driver()->warning($message, $context);
     }
@@ -591,7 +590,7 @@ public function warning(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function notice(string|Stringable $message, array $context = []): void
+    public function notice($message, array $context = [])
     {
         $this->driver()->notice($message, $context);
     }
@@ -605,7 +604,7 @@ public function notice(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function info(string|Stringable $message, array $context = []): void
+    public function info($message, array $context = [])
     {
         $this->driver()->info($message, $context);
     }
@@ -617,7 +616,7 @@ public function info(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function debug(string|Stringable $message, array $context = []): void
+    public function debug($message, array $context = [])
     {
         $this->driver()->debug($message, $context);
     }
@@ -630,7 +629,7 @@ public function debug(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function log($level, string|Stringable $message, array $context = []): void
+    public function log($level, $message, array $context = [])
     {
         $this->driver()->log($level, $message, $context);
     }
diff --git a/src/Illuminate/Log/Logger.php b/src/Illuminate/Log/Logger.php
index ed7ac45b110d..382b77c6449f 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
 {
@@ -54,7 +53,7 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
      * @param  array  $context
      * @return void
      */
-    public function emergency(string|Stringable $message, array $context = []): void
+    public function emergency($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -66,7 +65,7 @@ public function emergency(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function alert(string|Stringable $message, array $context = []): void
+    public function alert($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -78,7 +77,7 @@ public function alert(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function critical(string|Stringable $message, array $context = []): void
+    public function critical($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -90,7 +89,7 @@ public function critical(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function error(string|Stringable $message, array $context = []): void
+    public function error($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -102,7 +101,7 @@ public function error(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function warning(string|Stringable $message, array $context = []): void
+    public function warning($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -114,7 +113,7 @@ public function warning(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function notice(string|Stringable $message, array $context = []): void
+    public function notice($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -126,7 +125,7 @@ public function notice(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function info(string|Stringable $message, array $context = []): void
+    public function info($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -138,7 +137,7 @@ public function info(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function debug(string|Stringable $message, array $context = []): void
+    public function debug($message, array $context = [])
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -151,7 +150,7 @@ public function debug(string|Stringable $message, array $context = []): void
      * @param  array  $context
      * @return void
      */
-    public function log($level, string|Stringable $message, array $context = []): void
+    public function log($level, $message, array $context = [])
     {
         $this->writeLog($level, $message, $context);
     }
@@ -164,7 +163,7 @@ public function log($level, string|Stringable $message, array $context = []): vo
      * @param  array  $context
      * @return void
      */
-    public function write($level, string|Stringable $message, array $context = []): void
+    public function write($level, $message, array $context = [])
     {
         $this->writeLog($level, $message, $context);
     }

From 8fc7ba4434c0e5976bf976c547af0b3f722b7312 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Sat, 25 Sep 2021 13:53:30 +0100
Subject: [PATCH 2/3] Jam return types on the log methods

---
 src/Illuminate/Log/LogManager.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Illuminate/Log/LogManager.php b/src/Illuminate/Log/LogManager.php
index a3f7f0afdeab..b0bfd926d81e 100644
--- a/src/Illuminate/Log/LogManager.php
+++ b/src/Illuminate/Log/LogManager.php
@@ -521,7 +521,7 @@ protected function parseDriver($driver)
      * @param  array  $context
      * @return void
      */
-    public function emergency($message, array $context = [])
+    public function emergency($message, array $context = []): void
     {
         $this->driver()->emergency($message, $context);
     }
@@ -536,7 +536,7 @@ public function emergency($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function alert($message, array $context = [])
+    public function alert($message, array $context = []): void
     {
         $this->driver()->alert($message, $context);
     }
@@ -550,7 +550,7 @@ public function alert($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function critical($message, array $context = [])
+    public function critical($message, array $context = []): void
     {
         $this->driver()->critical($message, $context);
     }
@@ -563,7 +563,7 @@ public function critical($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function error($message, array $context = [])
+    public function error($message, array $context = []): void
     {
         $this->driver()->error($message, $context);
     }
@@ -578,7 +578,7 @@ public function error($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function warning($message, array $context = [])
+    public function warning($message, array $context = []): void
     {
         $this->driver()->warning($message, $context);
     }
@@ -590,7 +590,7 @@ public function warning($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function notice($message, array $context = [])
+    public function notice($message, array $context = []): void
     {
         $this->driver()->notice($message, $context);
     }
@@ -604,7 +604,7 @@ public function notice($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function info($message, array $context = [])
+    public function info($message, array $context = []): void
     {
         $this->driver()->info($message, $context);
     }
@@ -616,7 +616,7 @@ public function info($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function debug($message, array $context = [])
+    public function debug($message, array $context = []): void
     {
         $this->driver()->debug($message, $context);
     }
@@ -629,7 +629,7 @@ public function debug($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function log($level, $message, array $context = [])
+    public function log($level, $message, array $context = []): void
     {
         $this->driver()->log($level, $message, $context);
     }

From 53d4e42544d797c3f227ef92eeebf82086cc10de Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Sat, 25 Sep 2021 13:54:18 +0100
Subject: [PATCH 3/3] And again

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

diff --git a/src/Illuminate/Log/Logger.php b/src/Illuminate/Log/Logger.php
index 382b77c6449f..180159b5e85c 100755
--- a/src/Illuminate/Log/Logger.php
+++ b/src/Illuminate/Log/Logger.php
@@ -53,7 +53,7 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
      * @param  array  $context
      * @return void
      */
-    public function emergency($message, array $context = [])
+    public function emergency($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -65,7 +65,7 @@ public function emergency($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function alert($message, array $context = [])
+    public function alert($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -77,7 +77,7 @@ public function alert($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function critical($message, array $context = [])
+    public function critical($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -89,7 +89,7 @@ public function critical($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function error($message, array $context = [])
+    public function error($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -101,7 +101,7 @@ public function error($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function warning($message, array $context = [])
+    public function warning($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -113,7 +113,7 @@ public function warning($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function notice($message, array $context = [])
+    public function notice($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -125,7 +125,7 @@ public function notice($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function info($message, array $context = [])
+    public function info($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -137,7 +137,7 @@ public function info($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function debug($message, array $context = [])
+    public function debug($message, array $context = []): void
     {
         $this->writeLog(__FUNCTION__, $message, $context);
     }
@@ -150,7 +150,7 @@ public function debug($message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function log($level, $message, array $context = [])
+    public function log($level, $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }
@@ -163,7 +163,7 @@ public function log($level, $message, array $context = [])
      * @param  array  $context
      * @return void
      */
-    public function write($level, $message, array $context = [])
+    public function write($level, $message, array $context = []): void
     {
         $this->writeLog($level, $message, $context);
     }