Fix compatibility with older mongodb server and driver

GromNaN · GromNaN · commit 5e567e858c4e · 2023-11-02T21:05:32.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -123,7 +123,7 @@ protected function doWrite(#[\SensitiveParameter] string $sessionId, string $dat
         $fields = [
             $this->options['time_field'] => $this->getUTCDateTime(),
             $this->options['expiry_field'] => $expiry,
-            $this->options['data_field'] => new Binary($data),
+            $this->options['data_field'] => new Binary($data, Binary::TYPE_GENERIC),
         ];
 
         $write = new BulkWrite();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -16,6 +16,7 @@
 use MongoDB\Client;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
+use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\Exception\ConnectionException;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\Query;
@@ -80,7 +81,14 @@ public function testCreateFromClient()
 
     protected function tearDown(): void
     {
-        $this->manager->executeCommand(self::DABASE_NAME, new Command(['drop' => self::COLLECTION_NAME]));
+        try {
+            $this->manager->executeCommand(self::DABASE_NAME, new Command(['drop' => self::COLLECTION_NAME]));
+        } catch (CommandException $e) {
+            // The server may return an error if the collection does not exist
+            if ($e->getCode() !== 26) {
+                throw $e;
+            }
+        }
     }
 
     /** @dataProvider provideInvalidOptions */
@@ -191,7 +199,7 @@ private function insertSession(string $sessionId, string $data, int $timeDiff):
         $write = new BulkWrite();
         $write->insert([
             '_id' => $sessionId,
-            'data' => new Binary($data),
+            'data' => new Binary($data, Binary::TYPE_GENERIC),
             'time' => new UTCDateTime($time * 1000),
             'expires_at' => new UTCDateTime(($time + (int) \ini_get('session.gc_maxlifetime')) * 1000),
         ]);
