fix merge

nicolas-grekas · nicolas-grekas · commit e9bcd217df24 · 2018-01-13T15:03:33.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -167,7 +167,7 @@ public function testRequestWithBadHost()
 
         $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
 
-        $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->requestStack);
+        $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
         $listener->onKernelRequest($event);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function testRequestWithBadHost()`
`167`	`167`
`168`	`168`	`$requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();`
`169`	`169`
`170`		`- $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->requestStack);`
	`170`	`+ $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());`
`171`	`171`	`$listener->onKernelRequest($event);`
`172`	`172`	`}`
`173`	`173`	`}`