Skip to content

[9.x] Restore psr/log v1 support #40093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2021
Merged

[9.x] Restore psr/log v1 support #40093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Broadcasting/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
22 changes: 11 additions & 11 deletions src/Illuminate/Log/Logger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down