Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3272447 by alexpott, Spokje, catch, xjm: Update to PSR/log v3

merge-requests/2367/head
catch 2022-06-10 09:43:20 +01:00
parent f35400e835
commit aac42cfeaf
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composer.lock generated
View File

@ -441,7 +441,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "78d71b79ee40fcc2305472ed336bddcb03aacafc"
"reference": "dc9d28de148cebd49d2c7cf3650fd836ed430a77"
},
"require": {
"asm89/stack-cors": "^2.0.2",
@ -466,7 +466,7 @@
"masterminds/html5": "^2.7",
"pear/archive_tar": "^1.4.14",
"php": ">=8.1.0",
"psr/log": "^2.0",
"psr/log": "^3.0",
"symfony/console": "^6.1",
"symfony/dependency-injection": "^6.1",
"symfony/event-dispatcher": "^6.1",
@ -1756,16 +1756,16 @@
},
{
"name": "psr/log",
"version": "2.0.0",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
"reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
"url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
"shasum": ""
},
"require": {
@ -1774,7 +1774,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "3.x-dev"
}
},
"autoload": {
@ -1800,9 +1800,9 @@
"psr-3"
],
"support": {
"source": "https://github.com/php-fig/log/tree/2.0.0"
"source": "https://github.com/php-fig/log/tree/3.0.0"
},
"time": "2021-07-14T16:41:46+00:00"
"time": "2021-07-14T16:46:02+00:00"
},
{
"name": "ralouphie/getallheaders",

2
composer/Metapackage/CoreRecommended/composer.json
View File

@ -27,7 +27,7 @@
"psr/http-client": "1.0.1",
"psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
"psr/log": "2.0.0",
"psr/log": "3.0.0",
"ralouphie/getallheaders": "3.0.3",
"symfony/console": "v6.1.1",
"symfony/dependency-injection": "v6.1.0",

2
core/composer.json
View File

@ -41,7 +41,7 @@
"composer/semver": "^3.3",
"asm89/stack-cors": "^2.0.2",
"pear/archive_tar": "^1.4.14",
"psr/log": "^2.0"
"psr/log": "^3.0"
},
"conflict": {
"drush/drush": "<8.1.10"

2
core/lib/Drupal/Core/Logger/LoggerChannel.php
View File

@ -91,7 +91,7 @@ class LoggerChannel implements LoggerChannelInterface {
/**
* {@inheritdoc}
*/
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
if ($this->callDepth == self::MAX_CALL_DEPTH) {
return;
}

18
core/lib/Drupal/Core/Logger/RfcLoggerTrait.php
View File

@ -17,62 +17,62 @@ trait RfcLoggerTrait {
/**
* {@inheritdoc}
*/
public function emergency($message, array $context = []) {
public function emergency(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::EMERGENCY, $message, $context);
}
/**
* {@inheritdoc}
*/
public function alert($message, array $context = []) {
public function alert(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::ALERT, $message, $context);
}
/**
* {@inheritdoc}
*/
public function critical($message, array $context = []) {
public function critical(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::CRITICAL, $message, $context);
}
/**
* {@inheritdoc}
*/
public function error($message, array $context = []) {
public function error(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::ERROR, $message, $context);
}
/**
* {@inheritdoc}
*/
public function warning($message, array $context = []) {
public function warning(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::WARNING, $message, $context);
}
/**
* {@inheritdoc}
*/
public function notice($message, array $context = []) {
public function notice(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::NOTICE, $message, $context);
}
/**
* {@inheritdoc}
*/
public function info($message, array $context = []) {
public function info(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::INFO, $message, $context);
}
/**
* {@inheritdoc}
*/
public function debug($message, array $context = []) {
public function debug(string|\Stringable $message, array $context = []): void {
$this->log(RfcLogLevel::DEBUG, $message, $context);
}
/**
* {@inheritdoc}
*/
abstract public function log($level, $message, array $context = []);
abstract public function log($level, string|\Stringable $message, array $context = []): void;
}

2
core/modules/dblog/src/Logger/DbLog.php
View File

@ -52,7 +52,7 @@ class DbLog implements LoggerInterface {
/**
* {@inheritdoc}
*/
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
// Remove backtrace and exception since they may contain an unserializable variable.
unset($context['backtrace'], $context['exception']);

2
core/modules/syslog/src/Logger/SysLog.php
View File

@ -60,7 +60,7 @@ class SysLog implements LoggerInterface {
/**
* {@inheritdoc}
*/
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
global $base_url;
$format = $this->config->get('format');

2
core/modules/system/tests/modules/error_service_test/src/Logger/TestLog.php
View File

@ -16,7 +16,7 @@ class TestLog implements LoggerInterface {
/**
* {@inheritdoc}
*/
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
$trigger = [
'%type' => 'Exception',
'@message' => 'Deforestation',

2
core/modules/update/tests/src/Unit/UpdateFetcherTest.php
View File

@ -243,7 +243,7 @@ class UpdateFetcherTest extends UnitTestCase implements LoggerInterface {
/**
* {@inheritdoc}
*/
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
$this->logMessages[] = $context['@message'];
}

2
core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
View File

@ -192,7 +192,7 @@ class NaughtyRecursiveLogger implements LoggerInterface {
$this->channel = $channel;
}
public function log($level, $message, array $context = []) {
public function log($level, string|\Stringable $message, array $context = []): void {
$this->channel->log(rand(0, 7), $message, $context);
}