Add test to ensure bucket codec can be overridden

Author: alcaeus

src/GridFS/Bucket.php

@@ -37,6 +37,7 @@
 use MongoDB\Operation\Find;
 
 use function array_intersect_key;
+use function array_key_exists;
 use function assert;
 use function fopen;
 use function get_resource_type;
@@ -319,7 +320,7 @@ public function drop()
      */
     public function find($filter = [], array $options = [])
     {
-        if ($this->codec && ! isset($options['codec'])) {
+        if ($this->codec && ! array_key_exists('codec', $options)) {
             $options['codec'] = $this->codec;
         }
 
@@ -340,7 +341,7 @@ public function find($filter = [], array $options = [])
      */
     public function findOne($filter = [], array $options = [])
     {
-        if ($this->codec && ! isset($options['codec'])) {
+        if ($this->codec && ! array_key_exists('codec', $options)) {
             $options['codec'] = $this->codec;
         }
 

tests/GridFS/BucketFunctionalTest.php

@@ -344,6 +344,18 @@ public function testFindInheritsBucketCodec(): void
         $this->assertSame('a', $fileDocument->filename);
     }
 
+    public function testFindResetsInheritedBucketCodec(): void
+    {
+        $bucket = new Bucket($this->manager, $this->getDatabaseName(), ['codec' => new TestFileCodec()]);
+        $bucket->uploadFromStream('a', $this->createStream('foo'));
+
+        $cursor = $bucket->find([], ['codec' => null]);
+        $fileDocument = current($cursor->toArray());
+
+        $this->assertInstanceOf(BSONDocument::class, $fileDocument);
+        $this->assertSame('a', $fileDocument->filename);
+    }
+
     public function testFindOne(): void
     {
         $this->bucket->uploadFromStream('a', $this->createStream('foo'));
@@ -393,15 +405,33 @@ public function testFindOneInheritsBucketCodec(): void
         $bucket->uploadFromStream('b', $this->createStream('foobar'));
         $bucket->uploadFromStream('c', $this->createStream('foobarbaz'));
 
+        $fileDocument = $bucket->findOne(
+            ['length' => ['$lte' => 6]],
+            ['sort' => ['length' => -1]],
+        );
+
+        $this->assertInstanceOf(TestFile::class, $fileDocument);
+        $this->assertSame('b', $fileDocument->filename);
+        $this->assertSame(6, $fileDocument->length);
+    }
+
+    public function testFindOneResetsInheritedBucketCodec(): void
+    {
+        $bucket = new Bucket($this->manager, $this->getDatabaseName(), ['codec' => new TestFileCodec()]);
+
+        $bucket->uploadFromStream('a', $this->createStream('foo'));
+        $bucket->uploadFromStream('b', $this->createStream('foobar'));
+        $bucket->uploadFromStream('c', $this->createStream('foobarbaz'));
+
         $fileDocument = $bucket->findOne(
             ['length' => ['$lte' => 6]],
             [
                 'sort' => ['length' => -1],
-                'codec' => new TestFileCodec(),
+                'codec' => null,
             ],
         );
 
-        $this->assertInstanceOf(TestFile::class, $fileDocument);
+        $this->assertInstanceOf(BSONDocument::class, $fileDocument);
         $this->assertSame('b', $fileDocument->filename);
         $this->assertSame(6, $fileDocument->length);
     }