Merge v1.x into v2.x (#1483)

Author: mongodb-php-bot

src/Collection.php

@@ -890,6 +890,8 @@ public function listIndexes(array $options = []): Iterator
      */
     public function listSearchIndexes(array $options = []): Iterator
     {
+        $options = $this->inheritTypeMap($options);
+
         $operation = new ListSearchIndexes($this->databaseName, $this->collectionName, $options);
         $server = select_server($this->manager, $options);
 

tests/Collection/CollectionFunctionalTest.php

@@ -7,6 +7,7 @@
 use MongoDB\Collection;
 use MongoDB\Database;
 use MongoDB\Driver\BulkWrite;
+use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
@@ -20,6 +21,7 @@
 use function array_filter;
 use function call_user_func;
 use function is_scalar;
+use function iterator_to_array;
 use function json_encode;
 use function str_contains;
 use function usort;
@@ -751,6 +753,32 @@ public function testMethodInTransactionWithReadConcernOption($method): void
         }
     }
 
+    public function testListSearchIndexesInheritTypeMap(): void
+    {
+        $this->skipIfAtlasSearchIndexIsNotSupported();
+
+        $collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName(), ['typeMap' => ['root' => 'array']]);
+
+        // Insert a document to create the collection
+        $collection->insertOne(['_id' => 1]);
+
+        try {
+            $collection->createSearchIndex(['mappings' => ['dynamic' => false]], ['name' => 'test-search-index']);
+        } catch (CommandException $e) {
+            // Ignore duplicate errors in case this test is re-run too quickly
+            // Index is asynchronously dropped during tearDown, we only need to
+            // ensure it exists for this test.
+            if ($e->getCode() !== 68 /* IndexAlreadyExists */) {
+                throw $e;
+            }
+        }
+
+        $indexes = $collection->listSearchIndexes();
+        $indexes = iterator_to_array($indexes);
+        $this->assertCount(1, $indexes);
+        $this->assertIsArray($indexes[0]);
+    }
+
     /**
      * Create data fixtures.
      */

tests/FunctionalTestCase.php

@@ -454,6 +454,15 @@ protected function skipIfServerVersion(string $operator, string $version, ?strin
         }
     }
 
+    protected function skipIfAtlasSearchIndexIsNotSupported(): void
+    {
+        if (! self::isAtlas()) {
+            self::markTestSkipped('Search Indexes are only supported on MongoDB Atlas 7.0+');
+        }
+
+        $this->skipIfServerVersion('<', '7.0', 'Search Indexes are only supported on MongoDB Atlas 7.0+');
+    }
+
     protected function skipIfChangeStreamIsNotSupported(): void
     {
         if ($this->isStandalone()) {

tests/SpecTests/SearchIndexSpecTest.php

@@ -29,13 +29,9 @@ class SearchIndexSpecTest extends FunctionalTestCase
 
     public function setUp(): void
     {
-        if (! self::isAtlas()) {
-            self::markTestSkipped('Search Indexes are only supported on MongoDB Atlas 7.0+');
-        }
-
         parent::setUp();
 
-        $this->skipIfServerVersion('<', '7.0', 'Search Indexes are only supported on MongoDB Atlas 7.0+');
+        $this->skipIfAtlasSearchIndexIsNotSupported();
     }
 
     /**