Skip to content

Commit

Permalink
[Bridge/Monolog] Fix WebProcessor to accept a Request object.
Browse files Browse the repository at this point in the history
  • Loading branch information
dpb587 committed Sep 30, 2011
1 parent e6867bb commit e70c884
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
class WebProcessor extends BaseWebProcessor
{
public function __construct(RequestInterface $request)
public function __construct(Request $request)
{
parent::__construct($request->server->all());
}
Expand Down
54 changes: 54 additions & 0 deletions tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Tests\Bridge\Monolog\Processor;

use Monolog\Logger;
use Symfony\Bridge\Monolog\Processor\WebProcessor;
use Symfony\Component\HttpFoundation\Request;

class WebProcessorTest extends \PHPUnit_Framework_TestCase
{
public function testUsesRequestServerData()
{
$server = array(
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
);

$request = new Request();
$request->server->replace($server);

$processor = new WebProcessor($request);
$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']);
}

/**
* @return array Record
*/
protected function getRecord($level = Logger::WARNING, $message = 'test')
{
return array(
'message' => $message,
'context' => array(),
'level' => $level,
'level_name' => Logger::getLevelName($level),
'channel' => 'test',
'datetime' => new \DateTime(),
'extra' => array(),
);
}
}

0 comments on commit e70c884

Please sign in to comment.