Merge branch '5.4' into 6.3

* 5.4:
  [Lock] Fix mongodb extension requirement in tests

Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

@@ -13,6 +13,7 @@
 
 use MongoDB\Client;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
 
@@ -32,13 +33,16 @@ class MongoDbSessionHandlerTest extends TestCase
     private $storage;
     public $options;
 
-    protected function setUp(): void
+    public static function setUpBeforeClass(): void
     {
-        parent::setUp();
-
         if (!class_exists(Client::class)) {
-            $this->markTestSkipped('The mongodb/mongodb package is required.');
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
 
         $this->mongo = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()