Merge branch '5.4' into 6.0

* 5.4:
  [HttpFoundation] Fix session tests
  Bump Symfony version to 5.4.15
  Update VERSION for 5.4.14
  Update CHANGELOG for 5.4.14
  Bump Symfony version to 4.4.48
  Update VERSION for 4.4.47
  Update CONTRIBUTORS for 4.4.47
  Update CHANGELOG for 4.4.47

Author: nicolas-grekas

Tests/Session/Storage/Handler/Fixtures/common.inc

@@ -54,10 +54,12 @@ ob_start();
 class TestSessionHandler extends AbstractSessionHandler
 {
     private $data;
+    private $sessionId;
 
-    public function __construct($data = '')
+    public function __construct($data = '', $sessionId = null)
     {
         $this->data = $data;
+        $this->sessionId = $sessionId;
     }
 
     public function open(string $path, string $name): bool
@@ -130,21 +132,29 @@ class TestSessionHandler extends AbstractSessionHandler
 
     protected function doRead($sessionId): string
     {
-        echo __FUNCTION__.': ', $this->data, "\n";
+        if (isset($this->sessionId) && $sessionId !== $this->sessionId) {
+            echo __FUNCTION__ . ": invalid sessionId\n";
+
+            return '';
+        }
+        echo __FUNCTION__ . ': ', $this->data, "\n";
+        $this->sessionId = $sessionId;
 
         return $this->data;
     }
 
     protected function doWrite($sessionId, $data): bool
     {
         echo __FUNCTION__.': ', $data, "\n";
+        $this->sessionId = $sessionId;
 
         return true;
     }
 
     protected function doDestroy($sessionId): bool
     {
         echo __FUNCTION__, "\n";
+        $this->sessionId = '';
 
         return true;
     }

Tests/Session/Storage/Handler/Fixtures/regenerate.expected

@@ -9,9 +9,8 @@ close
 open
 validateId
 read
-doRead: abc|i:123;
+doRead: invalid sessionId
 read
-doRead: abc|i:123;
 
 write
 doWrite: abc|i:123;

Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected

@@ -8,7 +8,7 @@ close
 open
 validateId
 read
-doRead: 
+doRead: invalid sessionId
 read
 
 write