From e39e753584c126a8e7bf315d5213ff5d731aa365 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 17 Dec 2021 15:59:14 +0000 Subject: [PATCH] Restore psr/log v1 support --- composer.json | 2 +- src/Illuminate/Broadcasting/composer.json | 2 +- src/Illuminate/Log/Logger.php | 22 +++++++++++----------- src/Illuminate/Mail/composer.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 780068ce46a3..2b88b50b8f91 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": "^2.0|^3.0", + "psr/log": "^1.0|^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 6351a124f2a3..0ec225cd9d82 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": "^2.0|^3.0", + "psr/log": "^1.0|^2.0|^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 08e3cff54ef9..03ab5a4dcb31 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(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function emergency($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -65,7 +65,7 @@ public function emergency(Arrayable|Jsonable|\Stringable|array|string $message, * @param array $context * @return void */ - public function alert(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function alert($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -77,7 +77,7 @@ public function alert(Arrayable|Jsonable|\Stringable|array|string $message, arra * @param array $context * @return void */ - public function critical(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function critical($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -89,7 +89,7 @@ public function critical(Arrayable|Jsonable|\Stringable|array|string $message, a * @param array $context * @return void */ - public function error(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function error($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -101,7 +101,7 @@ public function error(Arrayable|Jsonable|\Stringable|array|string $message, arra * @param array $context * @return void */ - public function warning(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function warning($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -113,7 +113,7 @@ public function warning(Arrayable|Jsonable|\Stringable|array|string $message, ar * @param array $context * @return void */ - public function notice(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function notice($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -125,7 +125,7 @@ public function notice(Arrayable|Jsonable|\Stringable|array|string $message, arr * @param array $context * @return void */ - public function info(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function info($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -137,7 +137,7 @@ public function info(Arrayable|Jsonable|\Stringable|array|string $message, array * @param array $context * @return void */ - public function debug(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function debug($message, array $context = []): void { $this->writeLog(__FUNCTION__, $message, $context); } @@ -150,7 +150,7 @@ public function debug(Arrayable|Jsonable|\Stringable|array|string $message, arra * @param array $context * @return void */ - public function log($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function log($level, $message, array $context = []): void { $this->writeLog($level, $message, $context); } @@ -163,7 +163,7 @@ public function log($level, Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function write($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void + public function write($level, $message, array $context = []): void { $this->writeLog($level, $message, $context); } @@ -176,7 +176,7 @@ public function write($level, Arrayable|Jsonable|\Stringable|array|string $messa * @param array $context * @return void */ - protected function writeLog($level, Arrayable|Jsonable|\Stringable|array|string $message, $context): void + protected function writeLog($level, $message, $context): void { $this->logger->{$level}( $message = $this->formatMessage($message), diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 4152c6599f04..34038e55e66a 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": "^2.0|^3.0", + "psr/log": "^1.0|^2.0|^3.0", "symfony/mailer": "^6.0", "tijsverkoyen/css-to-inline-styles": "^2.2.2" },