Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Jul 30, 2015
1 parent 004c1fd commit 6b02601
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -139,15 +139,15 @@ public function testLoggingParameter($parameter, $log)
$kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$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));
}

public function getLoggingParameterData()
{
return array(
array(array('_route' => 'foo'), 'Matched route "foo".'),
array(array(), 'Matched route "n/a".'),
array(array('_route' => 'foo'), 'Matched route "foo" (parameters: "_route": "foo")'),
array(array(), 'Matched route "n/a" (parameters: )'),
);
}
}

0 comments on commit 6b02601

Please sign in to comment.