Add let and comment to explain delete

Separate Intentionally omitted option

Author: GromNaN

src/Operation/Delete.php

@@ -177,7 +177,17 @@ public function execute(Server $server)
      */
     public function getCommandDocument()
     {
-        return ['delete' => $this->collectionName, 'deletes' => [['q' => $this->filter] + $this->createDeleteOptions()]];
+        $cmd = ['delete' => $this->collectionName, 'deletes' => [['q' => $this->filter] + $this->createDeleteOptions()]];
+
+        if (isset($this->options['comment'])) {
+            $cmd['comment'] = $this->options['comment'];
+        }
+
+        if (isset($this->options['let'])) {
+            $cmd['let'] = (object) $this->options['let'];
+        }
+
+        return $cmd;
     }
 
     /**

tests/Operation/DeleteTest.php

@@ -7,6 +7,7 @@
 
 namespace MongoDB\Tests\Operation;
 
+use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Operation\Delete;
 use TypeError;
@@ -71,10 +72,10 @@ public function testExplainableCommandDocument(): void
         $options = [
             'collation' => ['locale' => 'fr'],
             'hint' => '_id_',
-            // Ignored options
             'let' => ['a' => 1],
-            'ordered' => true,
             'comment' => 'explain me',
+            // Intentionally omitted options
+            'writeConcern' => new WriteConcern(0),
         ];
         $operation = new Delete($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1], 0, $options);
 
@@ -88,6 +89,8 @@ public function testExplainableCommandDocument(): void
                     'hint' => '_id_',
                 ],
             ],
+            'comment' => 'explain me',
+            'let' => (object) ['a' => 1],
         ];
         $this->assertEquals($expected, $operation->getCommandDocument());
     }

tests/Operation/DistinctTest.php

@@ -4,6 +4,7 @@
 
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;
+use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Operation\Distinct;
 
@@ -60,9 +61,10 @@ public function testExplainableCommandDocument(): void
             'collation' => ['locale' => 'fr'],
             'maxTimeMS' => 100,
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),
+            'comment' => 'explain me',
+            // Intentionally omitted options
             'readPreference' => new ReadPreference(ReadPreference::SECONDARY_PREFERRED),
             'typeMap' => ['root' => 'array'],
-            'comment' => 'explain me',
         ];
         $operation = new Distinct($this->getDatabaseName(), $this->getCollectionName(), 'f', ['x' => 1], $options);
 

tests/Operation/FindAndModifyTest.php

@@ -97,13 +97,14 @@ public function testExplainableCommandDocument(): void
             'maxTimeMS' => 100,
             'new' => true,
             'query' => ['y' => 2],
-            'remove' => false,
             'sort' => ['x' => 1],
-            'typeMap' => ['root' => 'array'],
             'update' => ['$set' => ['x' => 2]],
             'upsert' => true,
             'let' => ['a' => 3],
-            'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
+            // Intentionally omitted options
+            'remove' => false, // When "update" is set
+            'typeMap' => ['root' => 'array'],
+            'writeConcern' => new WriteConcern(0),
         ];
         $operation = new FindAndModify($this->getDatabaseName(), $this->getCollectionName(), $options);
 

tests/Operation/FindOneAndDeleteTest.php

@@ -40,9 +40,10 @@ public function testExplainableCommandDocument(): void
             'comment' => 'explain me',
             'hint' => '_id_',
             'maxTimeMS' => 100,
-            'projection' => ['_id' => 0],
             'sort' => ['x' => 1],
             'let' => ['a' => 3],
+            // Intentionally omitted options
+            'projection' => ['_id' => 0],
             'typeMap' => ['root' => 'array'],
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
         ];

tests/Operation/FindOneAndReplaceTest.php

@@ -94,10 +94,11 @@ public function testExplainableCommandDocument(): void
             'hint' => '_id_',
             'maxTimeMS' => 100,
             'projection' => ['_id' => 0],
-            'returnDocument' => FindOneAndReplace::RETURN_DOCUMENT_AFTER,
             'sort' => ['x' => 1],
-            'typeMap' => ['root' => 'array'],
             'let' => ['a' => 3],
+            // Intentionally omitted options
+            'returnDocument' => FindOneAndReplace::RETURN_DOCUMENT_AFTER,
+            'typeMap' => ['root' => 'array'],
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
         ];
         $operation = new FindOneAndReplace($this->getDatabaseName(), $this->getCollectionName(), ['y' => 2], ['y' => 3], $options);

tests/Operation/FindOneAndUpdateTest.php

@@ -76,12 +76,13 @@ public function testExplainableCommandDocument(): void
             'comment' => 'explain me',
             'hint' => '_id_',
             'maxTimeMS' => 100,
-            'projection' => ['_id' => 0],
-            'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER,
             'sort' => ['x' => 1],
-            'typeMap' => ['root' => 'array'],
             'upsert' => true,
             'let' => ['a' => 3],
+            // Intentionally omitted options
+            'projection' => ['_id' => 0],
+            'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER,
+            'typeMap' => ['root' => 'array'],
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
         ];
         $operation = new FindOneAndUpdate($this->getDatabaseName(), $this->getCollectionName(), ['y' => 2], ['$set' => ['x' => 2]], $options);

tests/Operation/FindTest.php

@@ -166,24 +166,25 @@ public function testExplainableCommandDocument(): void
             'batchSize' => 123,
             'collation' => ['locale' => 'fr'],
             'comment' => 'explain me',
-            'cursorType' => Find::NON_TAILABLE,
             'hint' => '_id_',
             'limit' => 15,
             'max' => ['x' => 100],
-            'maxAwaitTimeMS' => 500,
             'maxTimeMS' => 100,
             'min' => ['x' => 10],
-            'modifiers' => ['foo' => 'bar'],
             'noCursorTimeout' => true,
             'oplogReplay' => true,
             'projection' => ['_id' => 0],
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),
-            'readPreference' => new ReadPreference(ReadPreference::SECONDARY_PREFERRED),
             'returnKey' => true,
             'showRecordId' => true,
             'skip' => 5,
             'sort' => ['x' => 1],
             'let' => ['y' => 2],
+            // Intentionally omitted options
+            'cursorType' => Find::NON_TAILABLE,
+            'maxAwaitTimeMS' => 500,
+            'modifiers' => ['foo' => 'bar'],
+            'readPreference' => new ReadPreference(ReadPreference::SECONDARY_PREFERRED),
             'typeMap' => ['root' => 'array'],
         ];
         $operation = new Find($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1], $options);