Propagation of type changes to GridFS

Author: GromNaN

psalm.xml.dist

@@ -23,6 +23,7 @@
         <file name="stubs/BSON/PackedArray.stub.php"/>
         <file name="stubs/Driver/Cursor.stub.php"/>
         <file name="stubs/Driver/CursorInterface.stub.php"/>
+        <file name="stubs/Driver/WriteResult.stub.php"/>
     </stubs>
 
     <issueHandlers>

src/GridFS/Bucket.php

@@ -583,16 +583,9 @@ public function rename(mixed $id, string $newFilename): void
             return;
         }
 
-        /* If the update resulted in no modification, it's possible that the
-         * file did not exist, in which case we must raise an error. Checking
-         * the write result's matched count will be most efficient, but fall
-         * back to a findOne operation if necessary (i.e. legacy writes).
-         */
-        $found = $updateResult->getMatchedCount() !== null
-            ? $updateResult->getMatchedCount() === 1
-            : $this->collectionWrapper->findFileById($id) !== null;
-
-        if (! $found) {
+        // If the update resulted in no modification, it's possible that the
+        // file did not exist, in which case we must raise an error.
+        if ($updateResult->getMatchedCount() !== 1) {
             throw FileNotFoundException::byId($id, $this->getFilesNamespace());
         }
     }

src/GridFS/CollectionWrapper.php

@@ -73,7 +73,7 @@ public function deleteChunksByFilesId(mixed $id): void
     /**
      * Delete all GridFS files and chunks for a given filename.
      */
-    public function deleteFileAndChunksByFilename(string $filename): ?int
+    public function deleteFileAndChunksByFilename(string $filename): int
     {
         /** @var iterable<array{_id: mixed}> $files */
         $files = $this->findFiles(['filename' => $filename], [
@@ -262,7 +262,7 @@ public function insertFile(array|object $file): void
     /**
      * Updates the filename field in the file document for all the files with a given filename.
      */
-    public function updateFilenameForFilename(string $filename, string $newFilename): ?int
+    public function updateFilenameForFilename(string $filename, string $newFilename): int
     {
         return $this->filesCollection->updateMany(
             ['filename' => $filename],

stubs/Driver/WriteResult.stub.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace MongoDB\Driver;
+
+final class WriteResult
+{
+    final private function __construct()
+    {
+    }
+
+    final public function __wakeup(): void
+    {
+    }
+
+    final public function getDeletedCount(): int
+    {
+    }
+
+    final public function getInsertedCount(): int
+    {
+    }
+
+    final public function getMatchedCount(): int
+    {
+    }
+
+    final public function getModifiedCount(): int
+    {
+    }
+
+    final public function getServer(): Server
+    {
+    }
+
+    final public function getUpsertedCount(): int
+    {
+    }
+
+    final public function getUpsertedIds(): array
+    {
+    }
+
+    final public function getWriteConcernError(): ?WriteConcernError
+    {
+    }
+
+    final public function getWriteErrors(): array
+    {
+    }
+
+    final public function getErrorReplies(): array
+    {
+    }
+
+    final public function isAcknowledged(): bool
+    {
+    }
+}