Let the server throw errors

mongodb · Jun 19, 2023 · 8513129 · 8513129
1 parent fac470b
commit 8513129
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -471,7 +471,7 @@
  <code>$this-&gt;options['writeConcern']</code>
  </MixedArgument>
  <MixedAssignment occurrences="5">
- <code>$cmd['writeConcern']</code>
+ <code>$cmd['comment']</code>
  <code>$deleteOptions['hint']</code>
  <code>$options['comment']</code>
  <code>$options['session']</code>

diff --git a/src/Operation/Aggregate.php b/src/Operation/Aggregate.php
@@ -300,9 +300,6 @@ public function getCommandDocument()
  {
  $cmd = $this->createCommandDocument();
 
- // The 'explain' option is incompatible with the explain command
- unset($cmd['explain']);
-
  // Read concern can change the query plan
  if (isset($this->options['readConcern'])) {
  $cmd['readConcern'] = $this->options['readConcern'];

diff --git a/src/Operation/Find.php b/src/Operation/Find.php
@@ -338,11 +338,6 @@ public function getCommandDocument()
  return $cmd;
  }
 
- // Read concern can change the query plan
- if (isset($this->options['readConcern'])) {
- $cmd['readConcern'] = $this->options['readConcern'];
- }
-
  // maxAwaitTimeMS is a Query level option so should not be considered here
  unset($options['maxAwaitTimeMS']);
 

diff --git a/tests/Operation/AggregateTest.php b/tests/Operation/AggregateTest.php
@@ -122,7 +122,7 @@ public function testExplainableCommandDocument(): void
  'readConcern' => new ReadConcern(ReadConcern::LOCAL),
  'useCursor' => true,
  // Intentionally omitted options
- 'explain' => true,
+ // The "explain" option is illegal
  'readPreference' => new ReadPreference(ReadPreference::SECONDARY_PREFERRED),
  'typeMap' => ['root' => 'array', 'document' => 'array'],
  'writeConcern' => new WriteConcern(0),
@@ -140,6 +140,7 @@ public function testExplainableCommandDocument(): void
  'maxTimeMS' => 100,
  'readConcern' => new ReadConcern(ReadConcern::LOCAL),
  'let' => (object) ['a' => 1],
+ 'cursor' => ['batchSize' => 100],
  ];
  $this->assertEquals($expected, $operation->getCommandDocument());
  }