Merge v1.20 into v1.x (#1416)

mongodb-php-bot · web-flow · commit 29743f849d3c · 2024-09-18T11:46:04.000+02:00
diff --git a/src/Operation/Watch.php b/src/Operation/Watch.php
@@ -317,7 +317,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;
@@ -433,7 +433,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
`@@ -317,7 +317,7 @@ final public function commandSucceeded(CommandSucceededEvent $event): void`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if (`
`320`		`- $this->shouldCaptureOperationTime($event->getServer()) &&`
	`320`	`+ $this->shouldCaptureOperationTime() &&`
`321`	`321`	`isset($reply->operationTime) && $reply->operationTime instanceof TimestampInterface`
`322`	`322`	`) {`
`323`	`323`	`$this->operationTime = $reply->operationTime;`
`@@ -433,7 +433,7 @@ private function resume(array\|object\|null $resumeToken = null, bool $hasAdvanced`
`433`	`433`	`*`
`434`	`434`	`* @see https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst#startatoperationtime`
`435`	`435`	`*/`
`436`		`- private function shouldCaptureOperationTime(Server $server): bool`
	`436`	`+ private function shouldCaptureOperationTime(): bool`
`437`	`437`	`{`
`438`	`438`	`if ($this->hasResumed) {`
`439`	`439`	`return false;`