Skip to content

Commit c07d7f1

Browse files
GrahamCampbellGrahamCampbell
authored
Revert "[9.x] Update psr/log version (#38852)"
This reverts commit 2b2420b.
1 parent 5ea1f91 commit c07d7f1

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"nesbot/carbon": "^2.31",
2828
"opis/closure": "^3.6",
2929
"psr/container": "^1.1.1|^2.0.1",
30-
"psr/log": "^3.0",
3130
"psr/simple-cache": "^1.0",
3231
"ramsey/uuid": "^4.0",
3332
"symfony/console": "^6.0",

‎src/Illuminate/Log/LogManager.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Monolog\Handler\WhatFailureGroupHandler;
1717
use Monolog\Logger as Monolog;
1818
use Psr\Log\LoggerInterface;
19-
use Stringable;
2019
use Throwable;
2120

2221
class LogManager implements LoggerInterface
@@ -522,7 +521,7 @@ protected function parseDriver($driver)
522521
* @param array $context
523522
* @return void
524523
*/
525-
public function emergency(string|Stringable $message, array $context = []): void
524+
public function emergency($message, array $context = [])
526525
{
527526
$this->driver()->emergency($message, $context);
528527
}
@@ -537,7 +536,7 @@ public function emergency(string|Stringable $message, array $context = []): void
537536
* @param array $context
538537
* @return void
539538
*/
540-
public function alert(string|Stringable $message, array $context = []): void
539+
public function alert($message, array $context = [])
541540
{
542541
$this->driver()->alert($message, $context);
543542
}
@@ -551,7 +550,7 @@ public function alert(string|Stringable $message, array $context = []): void
551550
* @param array $context
552551
* @return void
553552
*/
554-
public function critical(string|Stringable $message, array $context = []): void
553+
public function critical($message, array $context = [])
555554
{
556555
$this->driver()->critical($message, $context);
557556
}
@@ -564,7 +563,7 @@ public function critical(string|Stringable $message, array $context = []): void
564563
* @param array $context
565564
* @return void
566565
*/
567-
public function error(string|Stringable $message, array $context = []): void
566+
public function error($message, array $context = [])
568567
{
569568
$this->driver()->error($message, $context);
570569
}
@@ -579,7 +578,7 @@ public function error(string|Stringable $message, array $context = []): void
579578
* @param array $context
580579
* @return void
581580
*/
582-
public function warning(string|Stringable $message, array $context = []): void
581+
public function warning($message, array $context = [])
583582
{
584583
$this->driver()->warning($message, $context);
585584
}
@@ -591,7 +590,7 @@ public function warning(string|Stringable $message, array $context = []): void
591590
* @param array $context
592591
* @return void
593592
*/
594-
public function notice(string|Stringable $message, array $context = []): void
593+
public function notice($message, array $context = [])
595594
{
596595
$this->driver()->notice($message, $context);
597596
}
@@ -605,7 +604,7 @@ public function notice(string|Stringable $message, array $context = []): void
605604
* @param array $context
606605
* @return void
607606
*/
608-
public function info(string|Stringable $message, array $context = []): void
607+
public function info($message, array $context = [])
609608
{
610609
$this->driver()->info($message, $context);
611610
}
@@ -617,7 +616,7 @@ public function info(string|Stringable $message, array $context = []): void
617616
* @param array $context
618617
* @return void
619618
*/
620-
public function debug(string|Stringable $message, array $context = []): void
619+
public function debug($message, array $context = [])
621620
{
622621
$this->driver()->debug($message, $context);
623622
}
@@ -630,7 +629,7 @@ public function debug(string|Stringable $message, array $context = []): void
630629
* @param array $context
631630
* @return void
632631
*/
633-
public function log($level, string|Stringable $message, array $context = []): void
632+
public function log($level, $message, array $context = [])
634633
{
635634
$this->driver()->log($level, $message, $context);
636635
}

‎src/Illuminate/Log/Logger.php‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Illuminate\Log\Events\MessageLogged;
1010
use Psr\Log\LoggerInterface;
1111
use RuntimeException;
12-
use Stringable;
1312

1413
class Logger implements LoggerInterface
1514
{
@@ -54,7 +53,7 @@ public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = nu
5453
* @param array $context
5554
* @return void
5655
*/
57-
public function emergency(string|Stringable $message, array $context = []): void
56+
public function emergency($message, array $context = [])
5857
{
5958
$this->writeLog(__FUNCTION__, $message, $context);
6059
}
@@ -66,7 +65,7 @@ public function emergency(string|Stringable $message, array $context = []): void
6665
* @param array $context
6766
* @return void
6867
*/
69-
public function alert(string|Stringable $message, array $context = []): void
68+
public function alert($message, array $context = [])
7069
{
7170
$this->writeLog(__FUNCTION__, $message, $context);
7271
}
@@ -78,7 +77,7 @@ public function alert(string|Stringable $message, array $context = []): void
7877
* @param array $context
7978
* @return void
8079
*/
81-
public function critical(string|Stringable $message, array $context = []): void
80+
public function critical($message, array $context = [])
8281
{
8382
$this->writeLog(__FUNCTION__, $message, $context);
8483
}
@@ -90,7 +89,7 @@ public function critical(string|Stringable $message, array $context = []): void
9089
* @param array $context
9190
* @return void
9291
*/
93-
public function error(string|Stringable $message, array $context = []): void
92+
public function error($message, array $context = [])
9493
{
9594
$this->writeLog(__FUNCTION__, $message, $context);
9695
}
@@ -102,7 +101,7 @@ public function error(string|Stringable $message, array $context = []): void
102101
* @param array $context
103102
* @return void
104103
*/
105-
public function warning(string|Stringable $message, array $context = []): void
104+
public function warning($message, array $context = [])
106105
{
107106
$this->writeLog(__FUNCTION__, $message, $context);
108107
}
@@ -114,7 +113,7 @@ public function warning(string|Stringable $message, array $context = []): void
114113
* @param array $context
115114
* @return void
116115
*/
117-
public function notice(string|Stringable $message, array $context = []): void
116+
public function notice($message, array $context = [])
118117
{
119118
$this->writeLog(__FUNCTION__, $message, $context);
120119
}
@@ -126,7 +125,7 @@ public function notice(string|Stringable $message, array $context = []): void
126125
* @param array $context
127126
* @return void
128127
*/
129-
public function info(string|Stringable $message, array $context = []): void
128+
public function info($message, array $context = [])
130129
{
131130
$this->writeLog(__FUNCTION__, $message, $context);
132131
}
@@ -138,7 +137,7 @@ public function info(string|Stringable $message, array $context = []): void
138137
* @param array $context
139138
* @return void
140139
*/
141-
public function debug(string|Stringable $message, array $context = []): void
140+
public function debug($message, array $context = [])
142141
{
143142
$this->writeLog(__FUNCTION__, $message, $context);
144143
}
@@ -151,7 +150,7 @@ public function debug(string|Stringable $message, array $context = []): void
151150
* @param array $context
152151
* @return void
153152
*/
154-
public function log($level, string|Stringable $message, array $context = []): void
153+
public function log($level, $message, array $context = [])
155154
{
156155
$this->writeLog($level, $message, $context);
157156
}
@@ -164,7 +163,7 @@ public function log($level, string|Stringable $message, array $context = []): vo
164163
* @param array $context
165164
* @return void
166165
*/
167-
public function write($level, string|Stringable $message, array $context = []): void
166+
public function write($level, $message, array $context = [])
168167
{
169168
$this->writeLog($level, $message, $context);
170169
}

0 commit comments

Comments
 (0)