Selaa lähdekoodia

Rename referer->referrer and server_name->server, update changelog

Jordi Boggiano 13 vuotta sitten
vanhempi
commit
3c4bc178cc

+ 2 - 1
CHANGELOG.mdown

@@ -1,4 +1,4 @@
-* 1.0.3 (2012--)
+* 1.1.0 (2012--)
 
   Changes:
 
@@ -6,6 +6,7 @@
       handle the given log level
     * Added ChromePHPHandler
     * Added possibility to show microseconds in logs
+    * Added `server` and `referer` to WebProcessor output
 
 * 1.0.2 (2011-10-24)
 

+ 2 - 2
src/Monolog/Processor/WebProcessor.php

@@ -56,8 +56,8 @@ class WebProcessor
                 'url'         => $this->serverData['REQUEST_URI'],
                 'ip'          => $this->serverData['REMOTE_ADDR'],
                 'http_method' => $this->serverData['REQUEST_METHOD'],
-                'server_name' => $this->serverData['SERVER_NAME'],
-                'referer'     => $this->serverData['HTTP_REFERER'],
+                'server'      => $this->serverData['SERVER_NAME'],
+                'referrer'    => $this->serverData['HTTP_REFERER'],
             )
         );
 

+ 3 - 3
tests/Monolog/Processor/WebProcessorTest.php

@@ -30,8 +30,8 @@ class WebProcessorTest extends TestCase
         $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']);
-        $this->assertEquals($server['SERVER_NAME'], $record['extra']['server_name']);
+        $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
+        $this->assertEquals($server['SERVER_NAME'], $record['extra']['server']);
     }
 
     public function testProcessorDoNothingIfNoRequestUri()
@@ -55,7 +55,7 @@ class WebProcessorTest extends TestCase
         );
         $processor = new WebProcessor($server);
         $record = $processor($this->getRecord());
-        $this->assertNull($record['extra']['referer']);
+        $this->assertNull($record['extra']['referrer']);
     }
 
     /**