From c8c231f177e9c3d8fa81967a4c4a73cc8c685e5c Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Fri, 20 Apr 2012 16:44:33 +0100 Subject: [PATCH] Added referer to extra parameter --- src/Monolog/Processor/WebProcessor.php | 5 +++++ .../Handler/AbstractProcessingHandlerTest.php | 3 ++- tests/Monolog/Processor/WebProcessorTest.php | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Processor/WebProcessor.php b/src/Monolog/Processor/WebProcessor.php index 035606c7..eeea07ea 100644 --- a/src/Monolog/Processor/WebProcessor.php +++ b/src/Monolog/Processor/WebProcessor.php @@ -46,12 +46,17 @@ class WebProcessor return $record; } + if (!isset($this->serverData['HTTP_REFERER'])) { + $this->serverData['HTTP_REFERER'] = null; + } + $record['extra'] = array_merge( $record['extra'], array( 'url' => $this->serverData['REQUEST_URI'], 'ip' => $this->serverData['REMOTE_ADDR'], 'http_method' => $this->serverData['REQUEST_METHOD'], + 'referer' => $this->serverData['HTTP_REFERER'], ) ); diff --git a/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/tests/Monolog/Handler/AbstractProcessingHandlerTest.php index b9cd3502..ea6591d8 100644 --- a/tests/Monolog/Handler/AbstractProcessingHandlerTest.php +++ b/tests/Monolog/Handler/AbstractProcessingHandlerTest.php @@ -64,6 +64,7 @@ class AbstractProcessingHandlerTest extends TestCase 'REQUEST_URI' => '', 'REQUEST_METHOD' => '', 'REMOTE_ADDR' => '', + 'REQUEST_URI' => '', ))); $handledRecord = null; $handler->expects($this->once()) @@ -73,6 +74,6 @@ class AbstractProcessingHandlerTest extends TestCase })) ; $handler->handle($this->getRecord()); - $this->assertEquals(3, count($handledRecord['extra'])); + $this->assertEquals(4, count($handledRecord['extra'])); } } diff --git a/tests/Monolog/Processor/WebProcessorTest.php b/tests/Monolog/Processor/WebProcessorTest.php index 060cbb35..f055f305 100644 --- a/tests/Monolog/Processor/WebProcessorTest.php +++ b/tests/Monolog/Processor/WebProcessorTest.php @@ -21,12 +21,15 @@ class WebProcessorTest extends TestCase 'REQUEST_URI' => 'A', 'REMOTE_ADDR' => 'B', 'REQUEST_METHOD' => 'C', + 'HTTP_REFERER' => 'D', ); + $processor = new WebProcessor($server); $record = $processor($this->getRecord()); $this->assertEquals($server['REQUEST_URI'], $record['extra']['url']); $this->assertEquals($server['REMOTE_ADDR'], $record['extra']['ip']); $this->assertEquals($server['REQUEST_METHOD'], $record['extra']['http_method']); + $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referer']); } public function testProcessorDoNothingIfNoRequestUri() @@ -40,6 +43,18 @@ class WebProcessorTest extends TestCase $this->assertEmpty($record['extra']); } + public function testProcessorReturnNullIfNoHttpReferer() + { + $server = array( + 'REQUEST_URI' => 'A', + 'REMOTE_ADDR' => 'B', + 'REQUEST_METHOD' => 'C', + ); + $processor = new WebProcessor($server); + $record = $processor($this->getRecord()); + $this->assertNull($record['extra']['referer']); + } + /** * @expectedException UnexpectedValueException */