Fix cursor Id deprecation

mongodb · Sep 19, 2024 · aa4f51a · aa4f51a
1 parent 3ce4d6a
commit aa4f51a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/tests/Model/CodecCursorFunctionalTest.php b/tests/Model/CodecCursorFunctionalTest.php
@@ -4,7 +4,6 @@
 
 use MongoDB\BSON\Int64;
 use MongoDB\Codec\DocumentCodec;
-use MongoDB\Driver\CursorId;
 use MongoDB\Model\CodecCursor;
 use MongoDB\Tests\FunctionalTestCase;
 
@@ -55,12 +54,12 @@ function (...$args) use (&$previousErrorHandler, &$deprecations) {
  E_USER_DEPRECATED | E_DEPRECATED,
  );
 
- $cursorId = $codecCursor->getId();
+ $cursorId = $codecCursor->getId(true);
  } finally {
  restore_error_handler();
  }
 
- self::assertInstanceOf(CursorId::class, $cursorId);
+ self::assertInstanceOf(Int64::class, $cursorId);
 
  // Expect 2 deprecations: 1 from CodecCursor, one from Cursor
  self::assertCount(2, $deprecations);

diff --git a/tests/Operation/WatchFunctionalTest.php b/tests/Operation/WatchFunctionalTest.php
@@ -720,7 +720,7 @@ public function testInitialCursorIsNotClosed(): void
  * reports the cursor as alive. While the cursor ID is accessed through
  * ChangeStream, we'll need to use reflection to access the internal
  * Cursor and call isDead(). */
- $this->assertNotEquals('0', (string) $changeStream->getCursorId());
+ $this->assertNotEquals('0', (string) $changeStream->getCursorId(true));
 
  $rc = new ReflectionClass(ChangeStream::class);
  $rp = $rc->getProperty('iterator');
@@ -1370,11 +1370,11 @@ public function testOriginalReadPreferenceIsPreservedOnResume(): void
  }
 
  $changeStream = $operation->execute($secondary);
- $previousCursorId = $changeStream->getCursorId();
+ $previousCursorId = $changeStream->getCursorId(true);
  $this->forceChangeStreamResume();
 
  $changeStream->next();
- $this->assertNotSame($previousCursorId, $changeStream->getCursorId());
+ $this->assertNotSame($previousCursorId, $changeStream->getCursorId(true));
 
  $getCursor = Closure::bind(
  fn () => $this->iterator->getInnerIterator(),