Merge pull request mongodb#289

Author: jmikola

src/Operation/Find.php

@@ -214,10 +214,6 @@ private function createQuery()
     {
         $options = [];
 
-        if ( ! empty($this->options['allowPartialResults'])) {
-            $options['partial'] = true;
-        }
-
         if (isset($this->options['cursorType'])) {
             if ($this->options['cursorType'] === self::TAILABLE) {
                 $options['tailable'] = true;
@@ -228,7 +224,7 @@ private function createQuery()
             }
         }
 
-        foreach (['batchSize', 'limit', 'skip', 'sort', 'noCursorTimeout', 'oplogReplay', 'projection', 'readConcern'] as $option) {
+        foreach (['allowPartialResults', 'batchSize', 'comment', 'limit', 'maxTimeMS', 'noCursorTimeout', 'oplogReplay', 'projection', 'readConcern', 'skip', 'sort'] as $option) {
             if (isset($this->options[$option])) {
                 $options[$option] = $this->options[$option];
             }
@@ -240,14 +236,6 @@ private function createQuery()
 
         $modifiers = empty($this->options['modifiers']) ? [] : (array) $this->options['modifiers'];
 
-        if (isset($this->options['comment'])) {
-            $modifiers['$comment'] = $this->options['comment'];
-        }
-
-        if (isset($this->options['maxTimeMS'])) {
-            $modifiers['$maxTimeMS'] = $this->options['maxTimeMS'];
-        }
-
         if ( ! empty($modifiers)) {
             $options['modifiers'] = $modifiers;
         }