Skip to content

Commit 8e46f9c

Browse files
Restore psr/log v1 support (#40093)
1 parent bcf9ed1 commit 8e46f9c

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"monolog/monolog": "^2.0",
2828
"nesbot/carbon": "^2.53.1",
2929
"psr/container": "^1.1.1|^2.0.1",
30-
"psr/log": "^2.0|^3.0",
30+
"psr/log": "^1.0|^2.0|^3.0",
3131
"psr/simple-cache": "^1.0",
3232
"ramsey/uuid": "^4.2.2",
3333
"symfony/console": "^6.0",

src/Illuminate/Broadcasting/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"require": {
1717
"php": "^8.0.2",
1818
"ext-json": "*",
19-
"psr/log": "^2.0|^3.0",
19+
"psr/log": "^1.0|^2.0|^3.0",
2020
"illuminate/bus": "^9.0",
2121
"illuminate/collections": "^9.0",
2222
"illuminate/contracts": "^9.0",

src/Illuminate/Log/Logger.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
5353
* @param array $context
5454
* @return void
5555
*/
56-
public function emergency(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
56+
public function emergency($message, array $context = []): void
5757
{
5858
$this->writeLog(__FUNCTION__, $message, $context);
5959
}
@@ -65,7 +65,7 @@ public function emergency(Arrayable|Jsonable|\Stringable|array|string $message,
6565
* @param array $context
6666
* @return void
6767
*/
68-
public function alert(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
68+
public function alert($message, array $context = []): void
6969
{
7070
$this->writeLog(__FUNCTION__, $message, $context);
7171
}
@@ -77,7 +77,7 @@ public function alert(Arrayable|Jsonable|\Stringable|array|string $message, arra
7777
* @param array $context
7878
* @return void
7979
*/
80-
public function critical(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
80+
public function critical($message, array $context = []): void
8181
{
8282
$this->writeLog(__FUNCTION__, $message, $context);
8383
}
@@ -89,7 +89,7 @@ public function critical(Arrayable|Jsonable|\Stringable|array|string $message, a
8989
* @param array $context
9090
* @return void
9191
*/
92-
public function error(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
92+
public function error($message, array $context = []): void
9393
{
9494
$this->writeLog(__FUNCTION__, $message, $context);
9595
}
@@ -101,7 +101,7 @@ public function error(Arrayable|Jsonable|\Stringable|array|string $message, arra
101101
* @param array $context
102102
* @return void
103103
*/
104-
public function warning(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
104+
public function warning($message, array $context = []): void
105105
{
106106
$this->writeLog(__FUNCTION__, $message, $context);
107107
}
@@ -113,7 +113,7 @@ public function warning(Arrayable|Jsonable|\Stringable|array|string $message, ar
113113
* @param array $context
114114
* @return void
115115
*/
116-
public function notice(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
116+
public function notice($message, array $context = []): void
117117
{
118118
$this->writeLog(__FUNCTION__, $message, $context);
119119
}
@@ -125,7 +125,7 @@ public function notice(Arrayable|Jsonable|\Stringable|array|string $message, arr
125125
* @param array $context
126126
* @return void
127127
*/
128-
public function info(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
128+
public function info($message, array $context = []): void
129129
{
130130
$this->writeLog(__FUNCTION__, $message, $context);
131131
}
@@ -137,7 +137,7 @@ public function info(Arrayable|Jsonable|\Stringable|array|string $message, array
137137
* @param array $context
138138
* @return void
139139
*/
140-
public function debug(Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
140+
public function debug($message, array $context = []): void
141141
{
142142
$this->writeLog(__FUNCTION__, $message, $context);
143143
}
@@ -150,7 +150,7 @@ public function debug(Arrayable|Jsonable|\Stringable|array|string $message, arra
150150
* @param array $context
151151
* @return void
152152
*/
153-
public function log($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
153+
public function log($level, $message, array $context = []): void
154154
{
155155
$this->writeLog($level, $message, $context);
156156
}
@@ -163,7 +163,7 @@ public function log($level, Arrayable|Jsonable|\Stringable|array|string $message
163163
* @param array $context
164164
* @return void
165165
*/
166-
public function write($level, Arrayable|Jsonable|\Stringable|array|string $message, array $context = []): void
166+
public function write($level, $message, array $context = []): void
167167
{
168168
$this->writeLog($level, $message, $context);
169169
}
@@ -176,7 +176,7 @@ public function write($level, Arrayable|Jsonable|\Stringable|array|string $messa
176176
* @param array $context
177177
* @return void
178178
*/
179-
protected function writeLog($level, Arrayable|Jsonable|\Stringable|array|string $message, $context): void
179+
protected function writeLog($level, $message, $context): void
180180
{
181181
$this->logger->{$level}(
182182
$message = $this->formatMessage($message),

src/Illuminate/Mail/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"illuminate/macroable": "^9.0",
2323
"illuminate/support": "^9.0",
2424
"league/commonmark": "^2.0.2",
25-
"psr/log": "^2.0|^3.0",
25+
"psr/log": "^1.0|^2.0|^3.0",
2626
"symfony/mailer": "^6.0",
2727
"tijsverkoyen/css-to-inline-styles": "^2.2.2"
2828
},

0 commit comments

Comments
 (0)