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

mongodb-php-bot · web-flow · commit f736782d6b93 · 2024-11-08T16:20:11.000+01:00
diff --git a/tests/Operation/WatchFunctionalTest.php b/tests/Operation/WatchFunctionalTest.php
@@ -488,7 +488,7 @@ public function testRewindMultipleTimesWithNoResults(): void
     }
 
     #[DataProvider('provideCodecOptions')]
-    public function testNoChangeAfterResumeBeforeInsert(array $options): void
+    public function testNoChangeAfterResumeBeforeInsert(array $options, Closure $getIdentifier): void
     {
         $operation = new Watch(
             $this->manager,
@@ -1427,7 +1427,7 @@ public function testGetResumeTokenReturnsOriginalResumeTokenOnEmptyBatch(): void
      *  - If neither the startAfter nor resumeAfter options were specified, the getResumeToken result must be empty.
      */
     #[DataProvider('provideCodecOptions')]
-    public function testResumeTokenBehaviour(array $options): void
+    public function testResumeTokenBehaviour(array $options, Closure $getIdentifier): void
     {
         $this->skipIfServerVersion('<', '4.1.1', 'Testing resumeAfter and startAfter can only be tested on servers >= 4.1.1');
         $this->skipIfIsShardedCluster('Resume token behaviour can\'t be reliably tested on sharded clusters.');

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ public function testRewindMultipleTimesWithNoResults(): void`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`#[DataProvider('provideCodecOptions')]`
`491`		`- public function testNoChangeAfterResumeBeforeInsert(array $options): void`
	`491`	`+ public function testNoChangeAfterResumeBeforeInsert(array $options, Closure $getIdentifier): void`
`492`	`492`	`{`
`493`	`493`	`$operation = new Watch(`
`494`	`494`	`$this->manager,`
`@@ -1427,7 +1427,7 @@ public function testGetResumeTokenReturnsOriginalResumeTokenOnEmptyBatch(): void`
`1427`	`1427`	`* - If neither the startAfter nor resumeAfter options were specified, the getResumeToken result must be empty.`
`1428`	`1428`	`*/`
`1429`	`1429`	`#[DataProvider('provideCodecOptions')]`
`1430`		`- public function testResumeTokenBehaviour(array $options): void`
	`1430`	`+ public function testResumeTokenBehaviour(array $options, Closure $getIdentifier): void`
`1431`	`1431`	`{`
`1432`	`1432`	`$this->skipIfServerVersion('<', '4.1.1', 'Testing resumeAfter and startAfter can only be tested on servers >= 4.1.1');`
`1433`	`1433`	`$this->skipIfIsShardedCluster('Resume token behaviour can\'t be reliably tested on sharded clusters.');`