WIP: Support version 2.0 of the MongoDB driver

.github/workflows/continuous-integration.yml

@@ -16,6 +16,7 @@ jobs:
     runs-on: "ubuntu-20.04"
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - "8.1"
@@ -38,7 +39,7 @@ jobs:
           - dependencies: "lowest"
             php-version: "8.1"
             mongodb-version: "5.0"
-            driver-version: "1.17.0"
+            driver-version: "1.20.0"
             topology: "server"
             symfony-version: "stable"
           # Test with highest dependencies
@@ -55,6 +56,13 @@ jobs:
             driver-version: "stable"
             dependencies: "highest"
             symfony-version: "stable"
+          # Test with ext-2.0
+          - topology: "server"
+            php-version: "8.2"
+            mongodb-version: "7.0"
+            driver-version: "mongodb/[email protected]"
+            dependencies: "highest"
+            symfony-version: "7"
           # Test with a 5.0 sharded cluster
           # Currently disabled due to a bug where MongoDB reports "sharding status unknown"
 #          - topology: "sharded_cluster"

composer.json

@@ -22,15 +22,15 @@
     ],
     "require": {
         "php": "^8.1",
-        "ext-mongodb": "^1.17",
+        "ext-mongodb": "^1.20 || ^2.0",
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/collections": "^1.5 || ^2.0",
         "doctrine/event-manager": "^1.0 || ^2.0",
         "doctrine/instantiator": "^1.1 || ^2",
         "doctrine/persistence": "^3.2",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
-        "mongodb/mongodb": "^1.17.0",
+        "mongodb/mongodb": "^1.20 || ^2.0@dev",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0",

tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php

@@ -16,16 +16,22 @@
 use Documents\Project;
 use Documents\SubProject;
 use Documents\User;
+use Exception;
 use InvalidArgumentException;
 use LogicException;
+use MongoDB\BSON\Int64;
 use MongoDB\BSON\ObjectId;
 use MongoDB\Collection;
+use MongoDB\Driver\CursorId;
+use MongoDB\Driver\CursorInterface;
 use MongoDB\Driver\ReadPreference;
+use MongoDB\Driver\Server;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Traversable;
 
 use function array_keys;
+use function class_exists;
 use function iterator_to_array;
 
 use const DOCTRINE_MONGODB_DATABASE;
@@ -497,7 +503,7 @@
 
     public function testFindWithHint(): void
     {
-        $cursor = $this->createMock(Traversable::class);
+        $cursor = $this->createCursorMock();
 
         $collection = $this->getMockCollection();
         $collection->expects($this->once())
@@ -524,7 +530,7 @@
         $nearest            = new ReadPreference('nearest');
         $secondaryPreferred = new ReadPreference('secondaryPreferred');
 
-        $cursor = $this->createMock(Traversable::class);
+        $cursor = $this->createCursorMock();
 
         $collection = $this->getMockCollection();
         $collection->expects($this->once())
@@ -553,7 +559,41 @@
 
     public function testNonRewindable(): void
     {
-        $cursor = new ArrayIterator(['foo']);
+        $cursor = new class ([['foo']]) extends ArrayIterator implements CursorInterface {
+            public function getId(): Int64
+            {
+                return new Int64(0);
+            }
+
+            public function getServer(): Server
+            {
+                throw new Exception('Not implemented');
+            }
+
+            public function isDead(): bool
+            {
+                return false;
+            }
+
+            public function setTypeMap(array $typemap): void
+            {
+            }
+
+            public function toArray(): array
+            {
+                return iterator_to_array($this);
+            }
+
+            public function current(): array|null
+            {
+                return parent::current();
+            }
+
+            public function key(): int|null
+            {
+                return parent::key();
+            }
+        };
 
         $collection = $this->getMockCollection();
         $collection->expects($this->once())
@@ -583,6 +623,16 @@
     {
         return $this->createMock(Collection::class);
     }
+
+    private function createCursorMock(): CursorInterface|Traversable
+    {
+        return $this->createMock(
+            // Use the cursorID class to differentiate between 1.x and 2.x
+            class_exists(CursorId::class)
+                ? Traversable::class
+                : CursorInterface::class,
+        );
+    }
 }
 
 #[ODM\Document(collection: 'people')]

tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php

@@ -1,4 +1,4 @@
 <?php
 
 declare(strict_types=1);
 
@@ -23,6 +23,7 @@
 use Documents\Tournament\Tournament;
 use Documents\UserName;
 use InvalidArgumentException;
+use Iterator;
 use MongoDB\BSON\Document;
 use MongoDB\Client;
 use MongoDB\Collection;
@@ -31,7 +32,10 @@
 use MongoDB\Driver\WriteConcern;
 use MongoDB\GridFS\Bucket;
 use MongoDB\Model\CollectionInfo;
+use MongoDB\Model\CollectionInfoCommandIterator;
+use MongoDB\Model\CollectionInfoIterator;
 use MongoDB\Model\IndexInfo;
+use MongoDB\Model\IndexInfoIterator;
 use MongoDB\Model\IndexInfoIteratorIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Constraint\ArrayHasKey;
@@ -44,6 +48,7 @@
 use function array_map;
 use function assert;
 use function in_array;
+use function interface_exists;
 
 /**
  * @psalm-import-type IndexMapping from ClassMetadata
@@ -195,15 +200,15 @@
 
             $filesCollection
                 ->method('listIndexes')
-                ->willReturn([]);
+                ->willReturn($this->createIndexIterator());
             $filesCollection
                 ->expects($this->atLeastOnce())
                 ->method('createIndex')
                 ->with(['filename' => 1, 'uploadDate' => 1], $this->writeOptions($expectedWriteOptions));
 
             $chunksCollection
                 ->method('listIndexes')
-                ->willReturn([]);
+                ->willReturn($this->createIndexIterator());
             $chunksCollection
                 ->expects($this->atLeastOnce())
                 ->method('createIndex')
@@ -251,15 +256,15 @@
             if ($class === $fileBucket) {
                 $filesCollection
                     ->method('listIndexes')
-                    ->willReturn([]);
+                    ->willReturn($this->createIndexIterator());
                 $filesCollection
                     ->expects($this->once())
                     ->method('createIndex')
                     ->with(['filename' => 1, 'uploadDate' => 1], $this->writeOptions($expectedWriteOptions));
 
                 $chunksCollection
                     ->method('listIndexes')
-                    ->willReturn([]);
+                    ->willReturn($this->createIndexIterator());
                 $chunksCollection
                     ->expects($this->once())
                     ->method('createIndex')
@@ -296,7 +301,7 @@
         $collection
             ->expects($this->once())
             ->method('listIndexes')
-            ->willReturn(new IndexInfoIteratorIterator(new ArrayIterator([])));
+            ->willReturn($this->createIndexIterator());
         $collection
             ->expects($this->once())
             ->method('createIndex')
@@ -326,7 +331,7 @@
         $collection
             ->expects($this->once())
             ->method('listIndexes')
-            ->willReturn(new IndexInfoIteratorIterator(new ArrayIterator($indexes)));
+            ->willReturn($this->createIndexIterator($indexes));
         $collection
             ->expects($this->once())
             ->method('createIndex')
@@ -1307,10 +1312,10 @@
         $db->method('listCollections')->willReturnCallback(function () {
             $collections = [];
             foreach ($this->documentCollections as $collectionName => $collection) {
-                $collections[] = new CollectionInfo(['name' => $collectionName]);
+                $collections[] = ['name' => $collectionName];
             }
 
-            return $collections;
+            return $this->createCollectionIterator($collections);
         });
 
         return $db;
@@ -1343,4 +1348,28 @@
     {
         return new CommandException('Unrecognized pipeline stage name: \'$listSearchIndexes\'', 40234);
     }
+
+    private function createIndexIterator(array $indexes = []): Iterator
+    {
+        if (interface_exists(IndexInfoIterator::class)) {
+            return new IndexInfoIteratorIterator(new ArrayIterator($indexes));
+        }
+
+        return new ArrayIterator(array_map(
+            static fn (array $indexInfo) => new IndexInfo($indexInfo),
+            $indexes,
+        ));
+    }
+
+    private function createCollectionIterator(array $collections = []): Iterator
+    {
+        if (interface_exists(CollectionInfoIterator::class)) {
+            return new CollectionInfoCommandIterator(new ArrayIterator($collections));
+        }
+
+        return new ArrayIterator(array_map(
+            static fn (array $collectionInfo) => new CollectionInfo($collectionInfo),
+            $collections,
+        ));
+    }
 }