Fix merge
This commit is contained in:
parent
004c1fdf2a
commit
6b02601e7b
@ -139,15 +139,15 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
|
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
|
||||||
$request = Request::create('http://localhost/');
|
$request = Request::create('http://localhost/');
|
||||||
|
|
||||||
$listener = new RouterListener($requestMatcher, new RequestContext(), $logger, $this->requestStack);
|
$listener = new RouterListener($requestMatcher, new RequestContext(), $logger);
|
||||||
$listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
|
$listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLoggingParameterData()
|
public function getLoggingParameterData()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
array(array('_route' => 'foo'), 'Matched route "foo".'),
|
array(array('_route' => 'foo'), 'Matched route "foo" (parameters: "_route": "foo")'),
|
||||||
array(array(), 'Matched route "n/a".'),
|
array(array(), 'Matched route "n/a" (parameters: )'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user