Merge branch '6.0' into 6.1

* 6.0:
  Exclude from baseline generation deprecations triggered in legacy test
  [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used
  [DoctrineBridge] Add missing break
  [PropertyInfo] CS fix
  [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false
  CS fix
  [Cache] Respect $save option in ChainAdapter
  [ExpressionLanguage] fix tests (bis)
  [ExpressionLanguage] fix tests
  Allow passing null in twig_is_selected_choice
  [Cache] Respect $save option in ArrayAdapter
  [HttpKernel] Disable session tracking while collecting profiler data
  [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler
  [DoctrineBridge] Extend type guessing on enum fields
  [FrameworkBundle] Lower JsonSerializableNormalizer priority
  [Messenger] move resetting services at worker stopped into ResetServicesListener
  [Mailer] Fix Error Handling for OhMySMTP Bridge
  Fix for missing sender name in case with usage of the EnvelopeListener

Author: nicolas-grekas

DataCollector/MemoryDataCollector.php

@@ -94,11 +94,8 @@ private function convertToBytes(string $memoryLimit): int|float
 
         switch (substr($memoryLimit, -1)) {
             case 't': $max *= 1024;
-            // no break
             case 'g': $max *= 1024;
-            // no break
             case 'm': $max *= 1024;
-            // no break
             case 'k': $max *= 1024;
         }
 

EventListener/ProfilerListener.php

@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
@@ -96,8 +97,21 @@ public function onKernelResponse(ResponseEvent $event)
             return;
         }
 
-        if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) {
-            return;
+        $session = $request->hasPreviousSession() && $request->hasSession() ? $request->getSession() : null;
+
+        if ($session instanceof Session) {
+            $usageIndexValue = $usageIndexReference = &$session->getUsageIndex();
+            $usageIndexReference = \PHP_INT_MIN;
+        }
+
+        try {
+            if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) {
+                return;
+            }
+        } finally {
+            if ($session instanceof Session) {
+                $usageIndexReference = $usageIndexValue;
+            }
         }
 
         $this->profiles[$request] = $profile;