Merge branch 'v2.x' into ignore-disableMD5

mongodb · Nov 7, 2024 · 0d26c28 · 0d26c28
2 parents f8b4e79 + 0c8b2d9
commit 0d26c28
Show file tree

Hide file tree

Showing 15 changed files with 288 additions and 62 deletions.
diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml
@@ -23,10 +23,16 @@ buildvariants:
     run_on: rhel90-small
     tasks:
       - name: "build-all-php"
-  - name: build-rhel83-zseries
-    display_name: "Build: RHEL 8.3 Zseries"
+  - name: build-rhel9-zseries
+    display_name: "Build: RHEL 9 Zseries"
     tags: ["build", "rhel", "zseries", "tag"]
-    run_on: rhel83-zseries-small
+    run_on: rhel9-zseries-small
+    tasks:
+      - name: "build-all-php"
+  - name: build-rhel9-power
+    display_name: "Build: RHEL 9 PPC"
+    tags: ["build", "rhel", "power", "tag"]
+    run_on: rhel9-power-small
     tasks:
       - name: "build-all-php"
   - name: build-rhel82-arm64
@@ -35,12 +41,6 @@ buildvariants:
     run_on: rhel82-arm64
     tasks:
       - name: "build-all-php"
-  - name: build-rhel81-power8
-    display_name: "Build: RHEL 8.1 Power8"
-    tags: ["build", "rhel", "power8", "tag"]
-    run_on: rhel81-power8-large
-    tasks:
-      - name: "build-all-php"
   - name: build-rhel80
     display_name: "Build: RHEL 8.0"
     tags: ["build", "rhel", "x64", "pr", "tag"]

diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,4 +7,4 @@ updates:
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
diff --git a/src/Client.php b/src/Client.php
@@ -168,7 +168,7 @@ public function __debugInfo(): array
      */
     public function __get(string $databaseName): Database
     {
-        return $this->selectDatabase($databaseName);
+        return $this->getDatabase($databaseName);
     }
 
     /**
@@ -230,6 +230,37 @@ public function dropDatabase(string $databaseName, array $options = []): void
         $operation->execute($server);
     }
 
+    /**
+     * Returns a collection instance.
+     *
+     * If the collection does not exist in the database, it is not created when
+     * invoking this method.
+     *
+     * @see Collection::__construct() for supported options
+     * @throws InvalidArgumentException for parameter/option parsing errors
+     */
+    public function getCollection(string $databaseName, string $collectionName, array $options = []): Collection
+    {
+        $options += ['typeMap' => $this->typeMap, 'builderEncoder' => $this->builderEncoder];
+
+        return new Collection($this->manager, $databaseName, $collectionName, $options);
+    }
+
+    /**
+     * Returns a database instance.
+     *
+     * If the database does not exist on the server, it is not created when
+     * invoking this method.
+     *
+     * @see Database::__construct() for supported options
+     */
+    public function getDatabase(string $databaseName, array $options = []): Database
+    {
+        $options += ['typeMap' => $this->typeMap, 'builderEncoder' => $this->builderEncoder];
+
+        return new Database($this->manager, $databaseName, $options);
+    }
+
     /**
      * Return the Manager.
      */
@@ -329,9 +360,7 @@ final public function removeSubscriber(Subscriber $subscriber): void
      */
     public function selectCollection(string $databaseName, string $collectionName, array $options = []): Collection
     {
-        $options += ['typeMap' => $this->typeMap, 'builderEncoder' => $this->builderEncoder];
-
-        return new Collection($this->manager, $databaseName, $collectionName, $options);
+        return $this->getCollection($databaseName, $collectionName, $options);
     }
 
     /**
@@ -344,9 +373,7 @@ public function selectCollection(string $databaseName, string $collectionName, a
      */
     public function selectDatabase(string $databaseName, array $options = []): Database
     {
-        $options += ['typeMap' => $this->typeMap, 'builderEncoder' => $this->builderEncoder];
-
-        return new Database($this->manager, $databaseName, $options);
+        return $this->getDatabase($databaseName, $options);
     }
 
     /**

diff --git a/src/Database.php b/src/Database.php
@@ -171,7 +171,7 @@ public function __debugInfo(): array
      */
     public function __get(string $collectionName): Collection
     {
-        return $this->selectCollection($collectionName);
+        return $this->getCollection($collectionName);
     }
 
     /**
@@ -384,6 +384,28 @@ public function dropCollection(string $collectionName, array $options = []): voi
         $operation->execute($server);
     }
 
+    /**
+     * Returns a collection instance.
+     *
+     * If the collection does not exist in the database, it is not created when
+     * invoking this method.
+     *
+     * @see Collection::__construct() for supported options
+     * @throws InvalidArgumentException for parameter/option parsing errors
+     */
+    public function getCollection(string $collectionName, array $options = []): Collection
+    {
+        $options += [
+            'builderEncoder' => $this->builderEncoder,
+            'readConcern' => $this->readConcern,
+            'readPreference' => $this->readPreference,
+            'typeMap' => $this->typeMap,
+            'writeConcern' => $this->writeConcern,
+        ];
+
+        return new Collection($this->manager, $this->databaseName, $collectionName, $options);
+    }
+
     /**
      * Returns the database name.
      */
@@ -534,15 +556,7 @@ public function renameCollection(string $fromCollectionName, string $toCollectio
      */
     public function selectCollection(string $collectionName, array $options = []): Collection
     {
-        $options += [
-            'builderEncoder' => $this->builderEncoder,
-            'readConcern' => $this->readConcern,
-            'readPreference' => $this->readPreference,
-            'typeMap' => $this->typeMap,
-            'writeConcern' => $this->writeConcern,
-        ];
-
-        return new Collection($this->manager, $this->databaseName, $collectionName, $options);
+        return $this->getCollection($collectionName, $options);
     }
 
     /**

diff --git a/src/GridFS/Bucket.php b/src/GridFS/Bucket.php
@@ -219,6 +219,23 @@ public function delete(mixed $id): void
         }
     }
 
+    /**
+     * Delete all the revisions of a file name from the GridFS bucket.
+     *
+     * @param string $filename Filename
+     *
+     * @throws FileNotFoundException if no file could be selected
+     * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
+     */
+    public function deleteByName(string $filename): void
+    {
+        $count = $this->collectionWrapper->deleteFileAndChunksByFilename($filename);
+
+        if ($count === 0) {
+            throw FileNotFoundException::byFilename($filename);
+        }
+    }
+
     /**
      * Writes the contents of a GridFS file to a writable stream.
      *
@@ -590,6 +607,24 @@ public function rename(mixed $id, string $newFilename): void
         }
     }
 
+    /**
+     * Renames all the revisions of a file name in the GridFS bucket.
+     *
+     * @param string $filename    Filename
+     * @param string $newFilename New filename
+     *
+     * @throws FileNotFoundException if no file could be selected
+     * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
+     */
+    public function renameByName(string $filename, string $newFilename): void
+    {
+        $count = $this->collectionWrapper->updateFilenameForFilename($filename, $newFilename);
+
+        if ($count === 0) {
+            throw FileNotFoundException::byFilename($filename);
+        }
+    }
+
     /**
      * Writes the contents of a readable stream to a GridFS file.
      *

diff --git a/src/GridFS/CollectionWrapper.php b/src/GridFS/CollectionWrapper.php
@@ -148,9 +148,6 @@ public function findChunksByFileId(mixed $id, int $fromChunk = 0): CursorInterfa
      */
     public function findFileByFilenameAndRevision(string $filename, int $revision): ?object
     {
-        $filename = $filename;
-        $revision = $revision;
-
         if ($revision < 0) {
             $skip = abs($revision) - 1;
             $sortOrder = -1;

diff --git a/tests/GridFS/BucketFunctionalTest.php b/tests/GridFS/BucketFunctionalTest.php
@@ -158,6 +158,34 @@ public function testDeleteStillRemovesChunksIfFileDoesNotExist($input, $expected
         $this->assertCollectionCount($this->chunksCollection, 0);
     }
 
+    public function testDeleteByName(): void
+    {
+        $this->bucket->uploadFromStream('filename', self::createStream('foobar1'));
+        $this->bucket->uploadFromStream('filename', self::createStream('foobar2'));
+        $this->bucket->uploadFromStream('filename', self::createStream('foobar3'));
+
+        $this->bucket->uploadFromStream('other', self::createStream('foobar'));
+
+        $this->assertCollectionCount($this->filesCollection, 4);
+        $this->assertCollectionCount($this->chunksCollection, 4);
+
+        $this->bucket->deleteByName('filename');
+
+        $this->assertCollectionCount($this->filesCollection, 1);
+        $this->assertCollectionCount($this->chunksCollection, 1);
+
+        $this->bucket->deleteByName('other');
+
+        $this->assertCollectionCount($this->filesCollection, 0);
+        $this->assertCollectionCount($this->chunksCollection, 0);
+    }
+
+    public function testDeleteByNameShouldRequireFileToExist(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->bucket->deleteByName('nonexistent-name');
+    }
+
     public function testDownloadingFileWithMissingChunk(): void
     {
         $id = $this->bucket->uploadFromStream('filename', self::createStream('foobar'));
@@ -721,6 +749,24 @@ public function testRenameShouldRequireFileToExist(): void
         $this->bucket->rename('nonexistent-id', 'b');
     }
 
+    public function testRenameByName(): void
+    {
+        $this->bucket->uploadFromStream('filename', self::createStream('foo'));
+        $this->bucket->uploadFromStream('filename', self::createStream('foo'));
+        $this->bucket->uploadFromStream('filename', self::createStream('foo'));
+
+        $this->bucket->renameByName('filename', 'newname');
+
+        $this->assertNull($this->bucket->findOne(['filename' => 'filename']), 'No file has the old name');
+        $this->assertStreamContents('foo', $this->bucket->openDownloadStreamByName('newname'));
+    }
+
+    public function testRenameByNameShouldRequireFileToExist(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->bucket->renameByName('nonexistent-name', 'b');
+    }
+
     public function testUploadFromStream(): void
     {
         $options = [