Merge v1.x into v2.x

generator/config/accumulator/accumulator.yaml

@@ -73,7 +73,7 @@ tests:
                                     function(state, numCopies) {
                                         return { count: state.count + 1, sum: state.sum + numCopies }
                                     }
-                            accumulateArgs: [ "$copies" ],
+                            accumulateArgs: [ "$copies" ]
                             merge:
                                 $code: |-
                                     function(state1, state2) {

generator/config/stage/vectorSearch.yaml

@@ -22,7 +22,7 @@ arguments:
     -
         name: path
         type:
-            - searchPath
+            - string
         description: |
             Indexed vector type field to search.
     -

tests/FunctionalTestCase.php

@@ -334,7 +334,7 @@ protected function getFeatureCompatibilityVersion(?ReadPreference $readPreferenc
         $cursor = $this->manager->executeCommand(
             'admin',
             new Command(['getParameter' => 1, 'featureCompatibilityVersion' => 1]),
-            $readPreference ?: new ReadPreference(ReadPreference::PRIMARY),
+            ['readPreference' => $readPreference ?: new ReadPreference(ReadPreference::PRIMARY)],
         );
 
         $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);
@@ -357,7 +357,7 @@ protected function getServerVersion(?ReadPreference $readPreference = null)
         $buildInfo = $this->manager->executeCommand(
             $this->getDatabaseName(),
             new Command(['buildInfo' => 1]),
-            $readPreference ?: new ReadPreference(ReadPreference::PRIMARY),
+            ['readPreference' => $readPreference ?: new ReadPreference(ReadPreference::PRIMARY)],
         )->toArray()[0];
 
         if (isset($buildInfo->version) && is_string($buildInfo->version)) {
@@ -372,7 +372,7 @@ protected function getServerStorageEngine(?ReadPreference $readPreference = null
         $cursor = $this->manager->executeCommand(
             $this->getDatabaseName(),
             new Command(['serverStatus' => 1]),
-            $readPreference ?: new ReadPreference(ReadPreference::PRIMARY),
+            ['readPreference' => $readPreference ?: new ReadPreference(ReadPreference::PRIMARY)],
         );
 
         $result = current($cursor->toArray());

tests/SpecTests/PrimaryStepDownSpecTest.php

@@ -270,7 +270,7 @@ private function getTotalConnectionsCreated(?Server $server = null)
         $cursor = $server->executeCommand(
             $this->getDatabaseName(),
             new Command(['serverStatus' => 1]),
-            new ReadPreference(ReadPreference::PRIMARY),
+            ['readPreference' => new ReadPreference(ReadPreference::PRIMARY)],
         );
 
         $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);