Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit a2dce3a6c697 · 2019-07-11T12:26:11.000+02:00
* 4.2:
  [HttpKernel] fix tests
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -26,7 +26,7 @@ class TraceableEventDispatcherTest extends TestCase
     public function testStopwatchSections()
     {
         $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch = new Stopwatch());
-        $kernel = $this->getHttpKernel($dispatcher, function () { return new Response(); });
+        $kernel = $this->getHttpKernel($dispatcher, function () { return new Response('', 200, ['X-Debug-Token' => '292e1e']); });
         $request = Request::create('/');
         $response = $kernel->handle($request);
         $kernel->terminate($request, $response);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class TraceableEventDispatcherTest extends TestCase`
`26`	`26`	`public function testStopwatchSections()`
`27`	`27`	`{`
`28`	`28`	`$dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch = new Stopwatch());`
`29`		`- $kernel = $this->getHttpKernel($dispatcher, function () { return new Response(); });`
	`29`	`+ $kernel = $this->getHttpKernel($dispatcher, function () { return new Response('', 200, ['X-Debug-Token' => '292e1e']); });`
`30`	`30`	`$request = Request::create('/');`
`31`	`31`	`$response = $kernel->handle($request);`
`32`	`32`	`$kernel->terminate($request, $response);`