Merge pull request #298

Author: jmikola

src/Operation/Count.php

@@ -130,7 +130,7 @@ public function execute(Server $server)
 
         $readPreference = isset($this->options['readPreference']) ? $this->options['readPreference'] : null;
 
-        $cursor = $server->executeCommand($this->databaseName, $this->createCommand($server), $readPreference);
+        $cursor = $server->executeCommand($this->databaseName, $this->createCommand(), $readPreference);
         $result = current($cursor->toArray());
 
         // Older server versions may return a float
@@ -144,10 +144,9 @@ public function execute(Server $server)
     /**
      * Create the count command.
      *
-     * @param Server $server
      * @return Command
      */
-    private function createCommand(Server $server)
+    private function createCommand()
     {
         $cmd = ['count' => $this->collectionName];
 

src/Operation/Distinct.php

@@ -120,10 +120,9 @@ public function execute(Server $server)
     /**
      * Create the distinct command.
      *
-     * @param Server $server
      * @return Command
      */
-    private function createCommand(Server $server)
+    private function createCommand()
     {
         $cmd = [
             'distinct' => $this->collectionName,
@@ -142,7 +141,7 @@ private function createCommand(Server $server)
             $cmd['maxTimeMS'] = $this->options['maxTimeMS'];
         }
 
-        if (isset($this->options['readConcern']) && \MongoDB\server_supports_feature($server, self::$wireVersionForReadConcern)) {
+        if (isset($this->options['readConcern'])) {
             $cmd['readConcern'] = \MongoDB\read_concern_as_document($this->options['readConcern']);
         }