8000 feature #42176 [Console][HttpKernel] Implement `psr/log` 3 (derrabus) · shuvroroy/symfony@97e1f1f · GitHub
[go: up one dir, main page]
Skip to content

Commit 97e1f1f

Browse files
nicolas-grekasnicolas-grekas
committed
feature symfony#42176 [Console][HttpKernel] Implement psr/log 3 (derrabus)
This PR was merged into the 6.0 branch. Discussion ---------- [Console][HttpKernel] Implement `psr/log` 3 | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Commits ------- 95029e5 Implement psr/log 3
2 parents 205fd98 + 95029e5 commit 97e1f1f

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"psr/event-dispatcher-implementation": "1.0",
2424
"psr/http-client-implementation": "1.0",
2525
"psr/link-implementation": "1.0",
26-
"psr/log-implementation": "1.0|2.0",
26+
"psr/log-implementation": "1.0|2.0|3.0",
2727
"psr/simple-cache-implementation": "1.0",
2828
"symfony/cache-implementation": "1.1|2.0|3.0",
2929
"symfony/event-dispatcher-implementation": "2.0|3.0",
@@ -42,7 +42,7 @@
4242
"psr/container": "^1.1|^2.0",
4343
"psr/event-dispatcher": "^1.0",
4444
"psr/link": "^1.1",
45-
"psr/log": "^1|^2",
45+
"psr/log": "^1|^2|^3",
4646
"symfony/contracts": "^2.5|^3.0",
4747
"symfony/polyfill-ctype": "~1.8",
4848
"symfony/polyfill-intl-grapheme": "~1.0",

‎src/Symfony/Component/Console/Logger/ConsoleLogger.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ public function __construct(OutputInterface $output, array $verbosityLevelMap =
6161

6262
/**
6363
* {@inheritdoc}
64-
*
65-
* @return void
6664
*/
67-
public function log($level, $message, array $context = [])
65+
public function log($level, $message, array $context = []): void
6866
{
6967
if (!isset($this->verbosityLevelMap[$level])) {
7068
throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));

‎src/Symfony/Component/Console/composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"symfony/lock": "^5.4|^6.0",
2929
"symfony/process": "^5.4|^6.0",
3030
"symfony/var-dumper": "^5.4|^6.0",
31-
"psr/log": "^1|^2"
31+
"psr/log": "^1|^2|^3"
3232
},
3333
"provide": {
34-
"psr/log-implementation": "1.0|2.0"
34+
"psr/log-implementation": "1.0|2.0|3.0"
3535
},
3636
"suggest": {
3737
"symfony/event-dispatcher": "",
@@ -40,7 +40,6 @@
4040
"psr/log": "For using the console logger"
4141
},
4242
"conflict": {
43-
"psr/log": ">=3",
4443
"symfony/dependency-injection": "<5.4",
4544
"symfony/dotenv": "<5.4",
4645
"symfony/event-dispatcher": "<5.4",

‎src/Symfony/Component/HttpKernel/Log/Logger.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ public function __construct(string $minLevel = null, $output = null, callable $f
6565

6666
/**
6767
* {@inheritdoc}
68-
*
69-
* @return void
7068
*/
71-
public function log($level, $message, array $context = [])
69+
public function log($level, $message, array $context = []): void
7270
{
7371
if (!isset(self::LEVELS[$level])) {
7472
throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-client-contracts": "^1.1|^2.0|^3.0",
2323
"symfony/http-foundation": "^5.4|^6.0",
2424
"symfony/polyfill-ctype": "^1.8",
25-
"psr/log": "^1|^2"
25+
"psr/log": "^1|^2|^3"
2626
},
2727
"require-dev": {
2828
"symfony/browser-kit": "^5.4|^6.0",
@@ -42,7 +42,7 @@
4242
"twig/twig": "^2.13|^3.0.4"
4343
},
4444
"provide": {
45-
"psr/log-implementation": "1.0|2.0"
45+
"psr/log-implementation": "1.0|2.0|3.0"
4646
},
4747
"conflict": {
4848
"symfony/browser-kit": "<5.4",

0 commit comments

Comments
 (0)