Merge pull request #530

Author: jmikola

src/Operation/FindAndModify.php

@@ -210,7 +210,7 @@ public function execute(Server $server)
             throw UnsupportedException::writeConcernNotSupported();
         }
 
-        $cursor = $server->executeReadWriteCommand($this->databaseName, $this->createCommand($server), $this->createOptions());
+        $cursor = $server->executeWriteCommand($this->databaseName, $this->createCommand($server), $this->createOptions());
         $result = current($cursor->toArray());
 
         if ( ! isset($result->value)) {
@@ -280,7 +280,7 @@ private function createCommand(Server $server)
     /**
      * Create options for executing the command.
      *
-     * @see http://php.net/manual/en/mongodb-driver-server.executereadwritecommand.php
+     * @see http://php.net/manual/en/mongodb-driver-server.executewritecommand.php
      * @return array
      */
     private function createOptions()

tests/Operation/FindAndModifyFunctionalTest.php

@@ -3,13 +3,39 @@
 namespace MongoDB\Tests\Operation;
 
 use MongoDB\Driver\BulkWrite;
+use MongoDB\Driver\Manager;
+use MongoDB\Driver\ReadPreference;
 use MongoDB\Model\BSONDocument;
 use MongoDB\Operation\FindAndModify;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
 
 class FindAndModifyFunctionalTest extends FunctionalTestCase
 {
+    /**
+     * @see https://jira.mongodb.org/browse/PHPLIB-344
+     */
+    public function testManagerReadConcernIsOmitted()
+    {
+        $manager = new Manager($this->getUri(), ['readConcernLevel' => 'majority']);
+        $server = $manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
+
+        (new CommandObserver)->observe(
+            function() use ($server) {
+                $operation = new FindAndModify(
+                    $this->getDatabaseName(),
+                    $this->getCollectionName(),
+                    ['remove' => true]
+                );
+
+                $operation->execute($server);
+            },
+            function(stdClass $command) {
+                $this->assertObjectNotHasAttribute('readConcern', $command);
+            }
+        );
+    }
+
     public function testDefaultWriteConcernIsOmitted()
     {
         (new CommandObserver)->observe(