mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 19:57:41 +02:00
Code Issues Releases Wiki Activity

Restore filtering behavior, refs #663

Browse Source
This commit is contained in:
Jordi Boggiano
2015-10-14 14:12:50 +01:00
parent 0a2e4237d3
commit 80c4bfb9fd
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,9 +53,17 @@ class WebProcessor
}
if (null !== $extraFields) {
if (isset($extraFields[0])) {
foreach (array_keys($this->extraFields) as $fieldName) {
if (!in_array($fieldName, $extraFields)) {
unset($this->extraFields[$fieldName]);
}
}
} else {
$this->extraFields = $extraFields;
}
}
}
/**
* @param array $record

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

@@ -88,6 +88,21 @@ class WebProcessorTest extends TestCase
$this->assertSame(array('url' => 'A', 'http_method' => 'C'), $record['extra']);
}
public function testProcessorConfiguringOfExtraFields()
{
$server = array(
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'SERVER_NAME' => 'F',
);
$processor = new WebProcessor($server, array('url' => 'REMOTE_ADDR'));
$record = $processor($this->getRecord());
$this->assertSame(array('url' => 'B'), $record['extra']);
}
/**
* @expectedException UnexpectedValueException
*/