mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-29 17:30:14 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2020-07-08 21:27:58 +02:00
parent 0ae6fd8a09 c3a05db90c
commit 84342aa0a3
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Monolog/Processor/WebProcessor.php
View File

@@ -52,6 +52,10 @@ class WebProcessor implements ProcessorInterface
throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.'); throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.');
} }
if (isset($this->serverData['UNIQUE_ID'])) {
$this->extraFields['unique_id'] = 'UNIQUE_ID';
}
if (null !== $extraFields) { if (null !== $extraFields) {
if (isset($extraFields[0])) { if (isset($extraFields[0])) {
foreach (array_keys($this->extraFields) as $fieldName) { foreach (array_keys($this->extraFields) as $fieldName) {
@@ -91,10 +95,6 @@ class WebProcessor implements ProcessorInterface
$extra[$extraName] = $this->serverData[$serverName] ?? null; $extra[$extraName] = $this->serverData[$serverName] ?? null;
} }
if (isset($this->serverData['UNIQUE_ID'])) {
$extra['unique_id'] = $this->serverData['UNIQUE_ID'];
}
return $extra; return $extra;
} }
} }

13
tests/Monolog/Processor/WebProcessorTest.php
View File

@@ -88,6 +88,19 @@ class WebProcessorTest extends TestCase
$this->assertSame(['url' => 'A', 'http_method' => 'C'], $record['extra']); $this->assertSame(['url' => 'A', 'http_method' => 'C'], $record['extra']);
} }
public function testProcessorAddsOnlyRequestedExtraFieldsIncludingOptionalFields()
{
$server = array(
'REQUEST_URI' => 'A',
'UNIQUE_ID' => 'X',
);
$processor = new WebProcessor($server, array('url'));
$record = $processor($this->getRecord());
$this->assertSame(array('url' => 'A'), $record['extra']);
}
public function testProcessorConfiguringOfExtraFields() public function testProcessorConfiguringOfExtraFields()
{ {
$server = [ $server = [