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

mongodb-php-bot · web-flow · commit 74e90aab7de2 · 2024-09-18T13:45:06.000+02:00
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([

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private function onIteration(bool $incrementKey): void`
`255`	`255`	`* have been received in the last response. Therefore, we can unset the`
`256`	`256`	`* resumeCallable. This will free any reference to Watch as well as the`
`257`	`257`	`* only reference to any implicit session created therein. */`
`258`		`- if ((string) $this->getCursorId() === '0') {`
	`258`	`+ if ((string) $this->getCursorId(true) === '0') {`
`259`	`259`	`$this->resumeCallable = null;`
`260`	`260`	`}`
`261`	`261`