PHPLIB-189: Fix merging of comment and maxTimeMS options

Nick Dresselhaus · jmikola · commit b44164c59e3a · 2016-03-30T14:31:03.000-04:00
Previously, the values were set to an empty value, which causes exceptions within the driver.
diff --git a/src/Operation/Find.php b/src/Operation/Find.php
@@ -218,11 +218,11 @@ private function createQuery()
         $modifiers = empty($this->options['modifiers']) ? [] : (array) $this->options['modifiers'];
 
         if (isset($this->options['comment'])) {
-            $modifiers['$comment'] = $options['comment'];
+            $modifiers['$comment'] = $this->options['comment'];
         }
 
         if (isset($this->options['maxTimeMS'])) {
-            $modifiers['$maxTimeMS'] = $options['maxTimeMS'];
+            $modifiers['$maxTimeMS'] = $this->options['maxTimeMS'];
         }
 
         if ( ! empty($modifiers)) {

Original file line number	Diff line number	Diff line change
`@@ -218,11 +218,11 @@ private function createQuery()`
`218`	`218`	`$modifiers = empty($this->options['modifiers']) ? [] : (array) $this->options['modifiers'];`
`219`	`219`
`220`	`220`	`if (isset($this->options['comment'])) {`
`221`		`- $modifiers['$comment'] = $options['comment'];`
	`221`	`+ $modifiers['$comment'] = $this->options['comment'];`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`if (isset($this->options['maxTimeMS'])) {`
`225`		`- $modifiers['$maxTimeMS'] = $options['maxTimeMS'];`
	`225`	`+ $modifiers['$maxTimeMS'] = $this->options['maxTimeMS'];`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`if ( ! empty($modifiers)) {`