Merge v1.x into v2.x (#1417)

mongodb-php-bot · web-flow · commit 9054aef6f7e4 · 2024-09-18T12:37:41.000+02:00
diff --git a/src/Operation/Watch.php b/src/Operation/Watch.php
@@ -315,7 +315,7 @@ final public function commandSucceeded(CommandSucceededEvent $event): void
         }
 
         if (
-            $this->shouldCaptureOperationTime($event->getServer()) &&
+            $this->shouldCaptureOperationTime() &&
             isset($reply->operationTime) && $reply->operationTime instanceof TimestampInterface
         ) {
             $this->operationTime = $reply->operationTime;
@@ -431,7 +431,7 @@ private function resume(array|object|null $resumeToken = null, bool $hasAdvanced
      *
      * @see https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst#startatoperationtime
      */
-    private function shouldCaptureOperationTime(Server $server): bool
+    private function shouldCaptureOperationTime(): bool
     {
         if ($this->hasResumed) {
             return false;

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ final public function commandSucceeded(CommandSucceededEvent $event): void`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`if (`
`318`		`- $this->shouldCaptureOperationTime($event->getServer()) &&`
	`318`	`+ $this->shouldCaptureOperationTime() &&`
`319`	`319`	`isset($reply->operationTime) && $reply->operationTime instanceof TimestampInterface`
`320`	`320`	`) {`
`321`	`321`	`$this->operationTime = $reply->operationTime;`
`@@ -431,7 +431,7 @@ private function resume(array\|object\|null $resumeToken = null, bool $hasAdvanced`
`431`	`431`	`*`
`432`	`432`	`* @see https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst#startatoperationtime`
`433`	`433`	`*/`
`434`		`- private function shouldCaptureOperationTime(Server $server): bool`
	`434`	`+ private function shouldCaptureOperationTime(): bool`
`435`	`435`	`{`
`436`	`436`	`if ($this->hasResumed) {`
`437`	`437`	`return false;`