Skip to content

Commit 1663a9c

Browse files
authored
Update WebRequestProcessor::__invoke() param and return types
To support different versions of monolog. Bug: T361554
1 parent 92cadd6 commit 1663a9c

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

Logger/WebRequestProcessor.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Wikimedia\ToolforgeBundle\Logger;
66

7+
use Monolog\LogRecord;
78
use Symfony\Component\HttpFoundation\RequestStack;
89

910
/**
@@ -22,16 +23,23 @@ public function __construct(RequestStack $requestStack)
2223
/**
2324
* Adds extra information to the log entry.
2425
* @see https://symfony.com/doc/current/logging/processors.html
25-
* @param mixed[] $record
26-
* @return mixed[]
26+
* @param mixed[]|LogRecord $record
27+
* @return mixed[]|LogRecord
2728
*/
28-
public function __invoke(array $record): array
29+
public function __invoke(mixed $record): mixed
2930
{
3031
$request = $this->requestStack->getCurrentRequest();
3132

3233
if ($request) {
33-
$record['extra']['host'] = $request->getHost();
34-
$record['extra']['uri'] = $request->getUri();
34+
if ($record instanceof LogRecord) {
35+
$record->offsetSet('extra', [
36+
'host' => $request->getHost(),
37+
'uri' => $request->getUri(),
38+
]);
39+
} else {
40+
$record['extra']['host'] = $request->getHost();
41+
$record['extra']['uri'] = $request->getUri();
42+
}
3543
}
3644

3745
return $record;

0 commit comments

Comments
 (0)