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

File/UploadedFile.php

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

Session/Storage/NativeSessionStorage.php

@@ -136,7 +136,7 @@ public function start(): bool
         }
 
         $sessionId = $_COOKIE[session_name()] ?? null;
-        if ($sessionId && !preg_match('/^[a-zA-Z0-9,-]{22,}$/', $sessionId)) {
+        if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,}$/', $sessionId)) {
             // the session ID in the header is invalid, create a new one
             session_id(session_create_id());
         }

Tests/Session/Storage/NativeSessionStorageTest.php

@@ -284,12 +284,31 @@ public function testGetBagsOnceSessionStartedIsIgnored()
         $this->assertEquals($storage->getBag('flashes'), $bag);
     }
 
-    public function testRegenerateInvalidSessionId()
+    public function testRegenerateInvalidSessionIdForNativeFileSessionHandler()
     {
         $_COOKIE[session_name()] = '&~[';
-        $started = (new NativeSessionStorage())->start();
+        session_id('&~[');
+        $storage = new NativeSessionStorage([], new NativeFileSessionHandler());
+        $started = $storage->start();
 
         $this->assertTrue($started);
         $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id());
+        $storage->save();
+
+        $_COOKIE[session_name()] = '&~[';
+        session_id('&~[');
+        $storage = new NativeSessionStorage([], new SessionHandlerProxy(new NativeFileSessionHandler()));
+        $started = $storage->start();
+
+        $this->assertTrue($started);
+        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9,-]{22,}$/', session_id());
+        $storage->save();
+
+        $_COOKIE[session_name()] = '&~[';
+        session_id('&~[');
+        $storage = new NativeSessionStorage([], new NullSessionHandler());
+        $started = $storage->start();
+        $this->assertTrue($started);
+        $this->assertSame('&~[', session_id());
     }
 }