Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e70c884

Browse filesBrowse files
committed
[Bridge/Monolog] Fix WebProcessor to accept a Request object.
1 parent e6867bb commit e70c884
Copy full SHA for e70c884

File tree

Expand file treeCollapse file tree

2 files changed

+55
-1
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+55
-1
lines changed

‎src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class WebProcessor extends BaseWebProcessor
2323
{
24-
public function __construct(RequestInterface $request)
24+
public function __construct(Request $request)
2525
{
2626
parent::__construct($request->server->all());
2727
}
+54Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Tests\Bridge\Monolog\Processor;
13+
14+
use Monolog\Logger;
15+
use Symfony\Bridge\Monolog\Processor\WebProcessor;
16+
use Symfony\Component\HttpFoundation\Request;
17+
18+
class WebProcessorTest extends \PHPUnit_Framework_TestCase
19+
{
20+
public function testUsesRequestServerData()
21+
{
22+
$server = array(
23+
'REQUEST_URI' => 'A',
24+
'REMOTE_ADDR' => 'B',
25+
'REQUEST_METHOD' => 'C',
26+
);
27+
28+
$request = new Request();
29+
$request->server->replace($server);
30+
31+
$processor = new WebProcessor($request);
32+
$record = $processor($this->getRecord());
33+
34+
$this->assertEquals($server['REQUEST_URI'], $record['extra']['url']);
35+
$this->assertEquals($server['REMOTE_ADDR'], $record['extra']['ip']);
36+
$this->assertEquals($server['REQUEST_METHOD'], $record['extra']['http_method']);
37+
}
38+
39+
/**
40+
* @return array Record
41+
*/
42+
protected function getRecord($level = Logger::WARNING, $message = 'test')
43+
{
44+
return array(
45+
'message' => $message,
46+
'context' => array(),
47+
'level' => $level,
48+
'level_name' => Logger::getLevelName($level),
49+
'channel' => 'test',
50+
'datetime' => new \DateTime(),
51+
'extra' => array(),
52+
);
53+
}
54+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.