Merge branch '5.2' into 5.3

* 5.2:
  Fix usage of str_contains()
  fix intersection types in tests

Author: nicolas-grekas

Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use MongoDB\Client;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
@@ -23,7 +24,7 @@
 class MongoDbSessionHandlerTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&Client
      */
     private $mongo;
     private $storage;
@@ -33,11 +34,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (!class_exists(\MongoDB\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('The mongodb/mongodb package is required.');
         }
 
-        $this->mongo = $this->getMockBuilder(\MongoDB\Client::class)
+        $this->mongo = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -199,7 +200,7 @@ public function testGetConnection()
         $method = new \ReflectionMethod($this->storage, 'getMongo');
         $method->setAccessible(true);
 
-        $this->assertInstanceOf(\MongoDB\Client::class, $method->invoke($this->storage));
+        $this->assertInstanceOf(Client::class, $method->invoke($this->storage));
     }
 
     private function createMongoCollectionMock(): \MongoDB\Collection