diff --git a/composer.json b/composer.json index 2ca647e8a852..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": "^1.0|^2.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 60e2c6e3c987..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": "^1.0|^2.0", + "psr/log": "^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 180159b5e85c..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 $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function emergency($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($message, array $context = []): void /** * Log an alert message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function alert($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($message, array $context = []): void /** * Log a critical message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function critical($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($message, array $context = []): void /** * Log an error message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function error($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($message, array $context = []): void /** * Log a warning message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function warning($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($message, array $context = []): void /** * Log a notice to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function notice($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($message, array $context = []): void /** * Log an informational message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function info($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($message, array $context = []): void /** * Log a debug message to the logs. * - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function debug($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($message, array $context = []): void * Log a message to the logs. * * @param string $level - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function log($level, $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, $message, array $context = []): void * Dynamically pass log calls into the writer. * * @param string $level - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - public function write($level, $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, $message, array $context = []): void * Write a message to the log. * * @param string $level - * @param string $message + * @param Arrayable|Jsonable|\Stringable|array|string $message * @param array $context * @return void */ - protected function writeLog($level, $message, $context) + protected function writeLog($level, Arrayable|Jsonable|\Stringable|array|string $message, $context): void { $this->logger->{$level}( $message = $this->formatMessage($message), @@ -249,8 +249,8 @@ protected function fireLogEvent($level, $message, array $context = []) /** * Format the parameters for the logger. * - * @param mixed $message - * @return mixed + * @param Arrayable|Jsonable|\Stringable|array|string $message + * @return string */ protected function formatMessage($message) { @@ -262,7 +262,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..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": "^1.0|^2.0", + "psr/log": "^2.0|^3.0", "symfony/mailer": "^6.0", "tijsverkoyen/css-to-inline-styles": "^2.2.2" },