From 95029e560d8805efaac9399496028c2ccdac6c24 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 18 Jul 2021 18:39:07 +0200 Subject: [PATCH] Implement psr/log 3 Signed-off-by: Alexander M. Turek --- composer.json | 4 ++-- src/Symfony/Component/Console/Logger/ConsoleLogger.php | 4 +--- src/Symfony/Component/Console/composer.json | 5 ++--- src/Symfony/Component/HttpKernel/Log/Logger.php | 4 +--- src/Symfony/Component/HttpKernel/composer.json | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 8b313ae9846b5..b2ad4f5a52923 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "psr/event-dispatcher-implementation": "1.0", "psr/http-client-implementation": "1.0", "psr/link-implementation": "1.0", - "psr/log-implementation": "1.0|2.0", + "psr/log-implementation": "1.0|2.0|3.0", "psr/simple-cache-implementation": "1.0", "symfony/cache-implementation": "1.1|2.0|3.0", "symfony/event-dispatcher-implementation": "2.0|3.0", @@ -42,7 +42,7 @@ "psr/container": "^1.1|^2.0", "psr/event-dispatcher": "^1.0", "psr/link": "^1.1", - "psr/log": "^1|^2", + "psr/log": "^1|^2|^3", "symfony/contracts": "^2.5|^3.0", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php index 0379b2036c021..2c1e57cba245e 100644 --- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php +++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php @@ -61,10 +61,8 @@ public function __construct(OutputInterface $output, array $verbosityLevelMap = /** * {@inheritdoc} - * - * @return void */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { if (!isset($this->verbosityLevelMap[$level])) { throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level)); diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 7cc224827a062..9ecb8ffd1adc4 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -28,10 +28,10 @@ "symfony/lock": "^5.4|^6.0", "symfony/process": "^5.4|^6.0", "symfony/var-dumper": "^5.4|^6.0", - "psr/log": "^1|^2" + "psr/log": "^1|^2|^3" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "suggest": { "symfony/event-dispatcher": "", @@ -40,7 +40,6 @@ "psr/log": "For using the console logger" }, "conflict": { - "psr/log": ">=3", "symfony/dependency-injection": "<5.4", "symfony/dotenv": "<5.4", "symfony/event-dispatcher": "<5.4", diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php index d74703ff1c56d..ad719b434b376 100644 --- a/src/Symfony/Component/HttpKernel/Log/Logger.php +++ b/src/Symfony/Component/HttpKernel/Log/Logger.php @@ -65,10 +65,8 @@ public function __construct(string $minLevel = null, $output = null, callable $f /** * {@inheritdoc} - * - * @return void */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { if (!isset(self::LEVELS[$level])) { throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level)); diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 018a0b8f38c1b..4a6c6f0e1f87e 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -22,7 +22,7 @@ "symfony/http-client-contracts": "^1.1|^2.0|^3.0", "symfony/http-foundation": "^5.4|^6.0", "symfony/polyfill-ctype": "^1.8", - "psr/log": "^1|^2" + "psr/log": "^1|^2|^3" }, "require-dev": { "symfony/browser-kit": "^5.4|^6.0", @@ -42,7 +42,7 @@ "twig/twig": "^2.13|^3.0.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "conflict": { "symfony/browser-kit": "<5.4",