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

mongodb-php-bot · web-flow · commit 8956fb5594b1 · 2024-09-12T10:03:05.000+02:00
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -322,9 +322,6 @@
     </PossiblyNullArgument>
   </file>
   <file src="src/Model/CodecCursor.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[CursorId|Int64]]></code>
-    </ImplementedReturnTypeMismatch>
     <TooManyArguments>
       <code><![CDATA[getId]]></code>
     </TooManyArguments>
diff --git a/src/ChangeStream.php b/src/ChangeStream.php
@@ -106,7 +106,10 @@ public function current()
         return $this->codec->decode($value);
     }
 
-    /** @return CursorId|Int64 */
+    /**
+     * @return CursorId|Int64
+     * @psalm-return ($asInt64 is true ? Int64 : CursorId)
+     */
     #[ReturnTypeWillChange]
     public function getCursorId(bool $asInt64 = false)
     {
diff --git a/src/Model/CodecCursor.php b/src/Model/CodecCursor.php
@@ -71,7 +71,10 @@ public static function fromCursor(Cursor $cursor, DocumentCodec $codec): self
         return new self($cursor, $codec);
     }
 
-    /** @return CursorId|Int64 */
+    /**
+     * @return CursorId|Int64
+     * @psalm-return ($asInt64 is true ? Int64 : CursorId)
+     */
     #[ReturnTypeWillChange]
     public function getId(bool $asInt64 = false)
     {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,10 @@ public function current()`
`106`	`106`	`return $this->codec->decode($value);`
`107`	`107`	`}`
`108`	`108`
`109`		`- /** @return CursorId\|Int64 */`
	`109`	`+ /**`
	`110`	`+ * @return CursorId\|Int64`
	`111`	`+ * @psalm-return ($asInt64 is true ? Int64 : CursorId)`
	`112`	`+ */`
`110`	`113`	`#[ReturnTypeWillChange]`
`111`	`114`	`public function getCursorId(bool $asInt64 = false)`
`112`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,10 @@ public static function fromCursor(Cursor $cursor, DocumentCodec $codec): self`
`71`	`71`	`return new self($cursor, $codec);`
`72`	`72`	`}`
`73`	`73`
`74`		`- /** @return CursorId\|Int64 */`
	`74`	`+ /**`
	`75`	`+ * @return CursorId\|Int64`
	`76`	`+ * @psalm-return ($asInt64 is true ? Int64 : CursorId)`
	`77`	`+ */`
`75`	`78`	`#[ReturnTypeWillChange]`
`76`	`79`	`public function getId(bool $asInt64 = false)`
`77`	`80`	`{`