Merge v1.x into v2.x

examples/atlas_search.php

@@ -2,7 +2,7 @@
 
 /**
  * This example demonstrates how to create an Atlas Search index and perform a search query.
- * It requires a MongoDB Atlas M10+ cluster with Sample Dataset loaded.
+ * It requires a MongoDB Atlas cluster with Sample Dataset loaded.
  *
  * Use the MONGODB_URI environment variable to specify the connection string from the Atlas UI.
  */

src/Operation/Find.php

@@ -29,6 +29,7 @@
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\Model\CodecCursor;
 
+use function assert;
 use function is_array;
 use function is_bool;
 use function is_integer;
@@ -347,6 +348,22 @@
             }
         }
 
+        if (! empty($this->options['modifiers'])) {
+            /** @psalm-var array|object */
+            $modifiers = $this->options['modifiers'];
+            $options['modifiers'] = is_object($modifiers) ? document_to_array($modifiers) : $modifiers;
+        }
+
+        // Ensure no cursor is left behind when limit == batchSize by increasing batchSize
+        if (isset($options['limit'], $options['batchSize']) && $options['limit'] === $options['batchSize']) {
+            assert(is_integer($options['batchSize']));
+            $options['batchSize']++;
+        }
+
+        if (isset($options['limit']) && $options['limit'] === 1) {
+            $options['singleBatch'] = true;
+        }
+
         return $options;
     }
 }

tests/ExamplesTest.php

@@ -224,7 +224,7 @@ public static function provideExamples(): Generator
     }
 
     /**
-     * MongoDB Atlas Search example requires a MongoDB Atlas M10+ cluster with MongoDB 7.0+
+     * MongoDB Atlas Search example requires a MongoDB Atlas cluster with MongoDB 7.0+
      * Tips for insiders: if using a cloud-dev server, append ".mongodb.net" to the MONGODB_URI.
      */
     #[Group('atlas')]