Merge branch '4.4' into 5.3

fabpot · fabpot · commit e38d4ee79ecf · 2021-09-03T09:35:37.000+02:00
* 4.4:
  Revert "bug #42831 [Mime] Update mime types (fabpot)"
  Fix implicit float to int cast
  [Mime] Update mime types
  [HttpKernel] Fix timeline in profiler
diff --git a/DataCollector/TimeDataCollector.php b/DataCollector/TimeDataCollector.php
@@ -45,7 +45,7 @@ public function collect(Request $request, Response $response, \Throwable $except
         }
 
         $this->data = [
-            'token' => $response->headers->get('X-Debug-Token'),
+            'token' => $request->attributes->get('_stopwatch_token'),
             'start_time' => $startTime * 1000,
             'events' => [],
             'stopwatch_installed' => class_exists(Stopwatch::class, false),

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function collect(Request $request, Response $response, \Throwable $except`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$this->data = [`
`48`		`- 'token' => $response->headers->get('X-Debug-Token'),`
	`48`	`+ 'token' => $request->attributes->get('_stopwatch_token'),`
`49`	`49`	`'start_time' => $startTime * 1000,`
`50`	`50`	`'events' => [],`
`51`	`51`	`'stopwatch_installed' => class_exists(Stopwatch::class, false),`