Merge branch '5.4' into 6.3

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

src/Symfony/Component/HttpFoundation/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()

src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php

@@ -11,20 +11,30 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use MongoDB\Collection;
+use MongoDB\Client;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Lock\Store\MongoDbStore;
 use Symfony\Component\Lock\Store\StoreFactory;
 
 /**
  * @author Alexandre Daubois <[email protected]>
  *
- * @requires extension mongo
+ * @requires extension mongodb
  */
 class MongoDbStoreFactoryTest extends TestCase
 {
+    public static function setupBeforeClass(): void
+    {
+        if (!class_exists(Client::class)) {
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
+        }
+    }
+
     public function testCreateMongoDbCollectionStore()
     {
-        $store = StoreFactory::createStore($this->createMock(\MongoDB\Collection::class));
+        $store = StoreFactory::createStore($this->createMock(Collection::class));
 
         $this->assertInstanceOf(MongoDbStore::class, $store);
     }

src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php

@@ -32,7 +32,7 @@ class MongoDbStoreTest extends AbstractStoreTestCase
 
     public static function setupBeforeClass(): void
     {
-        if (!class_exists(\MongoDB\Client::class)) {
+        if (!class_exists(Client::class)) {
             throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }