Merge branch 'v1.4'

jmikola · jmikola · commit d8d95110adf6 · 2019-07-02T14:04:37.000-04:00
diff --git a/tests/Operation/WatchFunctionalTest.php b/tests/Operation/WatchFunctionalTest.php
@@ -973,7 +973,7 @@ private function killChangeStreamCursor(ChangeStream $changeStream)
     private function skipIfStartAtOperationTimeNotSupported()
     {
         if (!\MongoDB\server_supports_feature($this->getPrimaryServer(), self::$wireVersionForStartAtOperationTime)) {
-             $this->markTestSkipped('Operation time is not supported');
+             $this->markTestSkipped('startAtOperationTime is not supported');
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ private function killChangeStreamCursor(ChangeStream $changeStream)`
`973`	`973`	`private function skipIfStartAtOperationTimeNotSupported()`
`974`	`974`	`{`
`975`	`975`	`if (!\MongoDB\server_supports_feature($this->getPrimaryServer(), self::$wireVersionForStartAtOperationTime)) {`
`976`		`- $this->markTestSkipped('Operation time is not supported');`
	`976`	`+ $this->markTestSkipped('startAtOperationTime is not supported');`
`977`	`977`	`}`
`978`	`978`	`}`
`979`	`979`	`}`