Merge branch '4.4' into 5.3

fabpot · fabpot · commit 499af8da2e66 · 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/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -116,7 +116,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime
             return $opcache;
         }
 
-        $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
+        $apcu = new ApcuAdapter($namespace, intdiv($defaultLifetime, 5), $version);
         if (null !== $logger) {
             $apcu->setLogger($logger);
         }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/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
`@@ -116,7 +116,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime`
`116`	`116`	`return $opcache;`
`117`	`117`	`}`
`118`	`118`
`119`		`- $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);`
	`119`	`+ $apcu = new ApcuAdapter($namespace, intdiv($defaultLifetime, 5), $version);`
`120`	`120`	`if (null !== $logger) {`
`121`	`121`	`$apcu->setLogger($logger);`
`122`	`122`	`}`
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),`