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

mongodb · Sep 18, 2024 · 45b5205 · 45b5205
2 parents 29743f8 + b20703f
commit 45b5205
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ChangeStream.php b/src/ChangeStream.php
@@ -255,7 +255,7 @@ private function onIteration(bool $incrementKey): void
          * have been received in the last response. Therefore, we can unset the
          * resumeCallable. This will free any reference to Watch as well as the
          * only reference to any implicit session created therein. */
-        if ((string) $this->getCursorId() === '0') {
+        if ((string) $this->getCursorId(true) === '0') {
             $this->resumeCallable = null;
         }
 

diff --git a/tests/GridFS/StreamWrapperFunctionalTest.php b/tests/GridFS/StreamWrapperFunctionalTest.php
@@ -46,7 +46,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->filesCollection->insertMany([
-            ['_id' => 'length-10', 'length' => 10, 'chunkSize' => 4, 'uploadDate' => new UTCDateTime('1484202200000')],
+            ['_id' => 'length-10', 'length' => 10, 'chunkSize' => 4, 'uploadDate' => new UTCDateTime(1484202200000)],
         ]);
 
         $this->chunksCollection->insertMany([