Updates due to Jeremy's review

Author: derickr

docs/includes/apiargs-MongoDBDatabase-method-selectGridFSBucket-option.yaml

@@ -17,16 +17,11 @@ interface: phpmethod
 operation: ~
 optional: true
 ---
-arg_name: option
-name: disableMD5
-type: boolean
-description: |
-  Whether to disable automatic MD5 generation when storing files.
-
-  Defaults to ``false``.
-interface: phpmethod
-operation: ~
-optional: true
+source:
+  file: apiargs-MongoDBGridFSBucket-common-option.yaml
+  ref: disableMD5
+  post: |
+    .. versionadded: 1.4
 ---
 source:
   file: apiargs-common-option.yaml

docs/includes/apiargs-MongoDBGridFSBucket-method-construct-option.yaml

@@ -17,16 +17,11 @@ interface: phpmethod
 operation: ~
 optional: true
 ---
-arg_name: option
-name: disableMD5
-type: boolean
-description: |
-  Whether to disable automatic MD5 generation when storing files.
-
-  Defaults to ``false``.
-interface: phpmethod
-operation: ~
-optional: true
+source:
+  file: apiargs-MongoDBGridFSBucket-common-option.yaml
+  ref: disableMD5
+  post: |
+    .. versionadded: 1.4
 ---
 source:
   file: apiargs-common-option.yaml

docs/includes/apiargs-MongoDBGridFSBucket-method-openUploadStream-option.yaml

@@ -9,6 +9,8 @@ source:
 source:
   file: apiargs-MongoDBGridFSBucket-common-option.yaml
   ref: disableMD5
+  post: |
+    .. versionadded: 1.4
 ---
 source:
   file: apiargs-MongoDBGridFSBucket-common-option.yaml

docs/includes/apiargs-MongoDBGridFSBucket-method-uploadFromStream-option.yaml

@@ -9,6 +9,8 @@ source:
 source:
   file: apiargs-MongoDBGridFSBucket-common-option.yaml
   ref: disableMD5
+  post: |
+    .. versionadded: 1.4
 ---
 source:
   file: apiargs-MongoDBGridFSBucket-common-option.yaml

src/GridFS/Bucket.php

@@ -90,6 +90,7 @@ public function __construct(Manager $manager, $databaseName, array $options = []
         $options += [
             'bucketName' => self::$defaultBucketName,
             'chunkSizeBytes' => self::$defaultChunkSizeBytes,
+            'disableMD5' => false,
         ];
 
         if (isset($options['bucketName']) && ! is_string($options['bucketName'])) {
@@ -128,7 +129,7 @@ public function __construct(Manager $manager, $databaseName, array $options = []
         $this->databaseName = (string) $databaseName;
         $this->bucketName = $options['bucketName'];
         $this->chunkSizeBytes = $options['chunkSizeBytes'];
-        $this->disableMD5 = isset($options['disableMD5']) ? $options['disableMD5'] : false;
+        $this->disableMD5 = $options['disableMD5'];
         $this->readConcern = isset($options['readConcern']) ? $options['readConcern'] : $this->manager->getReadConcern();
         $this->readPreference = isset($options['readPreference']) ? $options['readPreference'] : $this->manager->getReadPreference();
         $this->typeMap = isset($options['typeMap']) ? $options['typeMap'] : self::$defaultTypeMap;
@@ -545,6 +546,9 @@ public function rename($id, $newFilename)
      *  * chunkSizeBytes (integer): The chunk size in bytes. Defaults to the
      *    bucket's chunk size.
      *
+     *  * disableMD5 (boolean): When true, no MD5 sum will be generated for
+     *    the stored file. Defaults to "false".
+     *
      *  * metadata (document): User data for the "metadata" field of the files
      *    collection document.
      *

src/GridFS/WritableStream.php

@@ -76,6 +76,7 @@ public function __construct(CollectionWrapper $collectionWrapper, $filename, arr
         $options += [
             '_id' => new ObjectId,
             'chunkSizeBytes' => self::$defaultChunkSizeBytes,
+            'disableMD5' => false,
         ];
 
         if (isset($options['aliases']) && ! \MongoDB\is_string_array($options['aliases'])) {
@@ -104,7 +105,7 @@ public function __construct(CollectionWrapper $collectionWrapper, $filename, arr
 
         $this->chunkSize = $options['chunkSizeBytes'];
         $this->collectionWrapper = $collectionWrapper;
-        $this->disableMD5 = isset($options['disableMD5']) ? $options['disableMD5'] : false;
+        $this->disableMD5 = $options['disableMD5'];
 
         if ( ! $this->disableMD5) {
             $this->hashCtx = hash_init('md5');
@@ -235,8 +236,7 @@ private function fileCollectionInsert()
         $this->file['uploadDate'] = new UTCDateTime;
 
         if ( ! $this->disableMD5) {
-            $md5 = hash_final($this->hashCtx);
-            $this->file['md5'] = $md5;
+            $this->file['md5'] = hash_final($this->hashCtx);
         }
 
         try {

tests/GridFS/BucketFunctionalTest.php

@@ -54,6 +54,10 @@ public function provideInvalidConstructorOptions()
             $options[][] = ['chunkSizeBytes' => $value];
         }
 
+        foreach ($this->getInvalidBooleanValues() as $value) {
+            $options[][] = ['disableMD5' => $value];
+        }
+
         foreach ($this->getInvalidReadConcernValues() as $value) {
             $options[][] = ['readConcern' => $value];
         }

tests/GridFS/WritableStreamFunctionalTest.php

@@ -49,6 +49,10 @@ public function provideInvalidConstructorOptions()
             $options[][] = ['chunkSizeBytes' => $value];
         }
 
+        foreach ($this->getInvalidBooleanValues() as $value) {
+            $options[][] = ['disableMD5' => $value];
+        }
+
         foreach ($this->getInvalidDocumentValues() as $value) {
             $options[][] = ['metadata' => $value];
         }