Merge branch 'v2.x' into PHPLIB-953

Author: GromNaN

UPGRADE-2.0.md

@@ -2,3 +2,29 @@ UPGRADE FROM 1.x to 2.0
 ========================
 
  * Classes in the namespace `MongoDB\Operation\` are `final`.
+
+GridFS
+------
+
+ * The `md5` is no longer calculated when a file is uploaded to GridFS.
+   Applications that require a file digest should implement it outside GridFS
+   and store in metadata.
+
+   ```php
+   $hash = hash_file('sha256', $filename);
+   $bucket->openUploadStream($fileId, ['metadata' => ['hash' => $hash]]);
+   ```
+
+ * The fields `contentType` and `aliases` are no longer stored in the `files`
+   collection. Applications that require this information should store it in
+   metadata.
+
+   **Before:**
+   ```php
+   $bucket->openUploadStream($fileId, ['contentType' => 'image/png']);
+   ```
+
+   **After:**
+   ```php
+   $bucket->openUploadStream($fileId, ['metadata' => ['contentType' => 'image/png']]);
+   ```

composer.json

@@ -11,7 +11,6 @@
     ],
     "require": {
         "php": "^8.1",
-        "ext-hash": "*",
         "ext-json": "*",
         "ext-mongodb": "^1.20.0",
         "composer-runtime-api": "^2.0",

generator/config/expression/round.yaml

@@ -8,15 +8,12 @@ type:
     - resolvesToLong
 encode: array
 description: |
-    Rounds a number to to a whole integer or to a specified decimal place.
+    Rounds a number to a whole integer or to a specified decimal place.
 arguments:
     -
         name: number
         type:
-            - resolvesToInt
-            - resolvesToDouble
-            - resolvesToDecimal
-            - resolvesToLong
+            - resolvesToNumber
         description: |
             Can be any valid expression that resolves to a number. Specifically, the expression must resolve to an integer, double, decimal, or long.
             $round returns an error if the expression resolves to a non-numeric data type.
@@ -38,3 +35,16 @@ tests:
                         $round:
                             - '$value'
                             - 1
+    -
+        name: 'Round Average Rating'
+        pipeline:
+            -
+                $project:
+                    roundedAverageRating:
+                        $avg:
+                            -
+                                $round:
+                                    -
+                                        $avg:
+                                            - '$averageRating'
+                                    - 2

src/Builder/Expression/FactoryTrait.php

@@ -45,7 +45,6 @@
 use function get_resource_type;
 use function in_array;
 use function is_array;
-use function is_bool;
 use function is_integer;
 use function is_object;
 use function is_resource;
@@ -59,11 +58,8 @@
 use function stream_copy_to_stream;
 use function stream_get_meta_data;
 use function stream_get_wrappers;
-use function trigger_error;
 use function urlencode;
 
-use const E_USER_DEPRECATED;
-
 /**
  * Bucket provides a public API for interacting with the GridFS files and chunks
  * collections.
@@ -88,8 +84,6 @@ class Bucket
 
     private string $bucketName;
 
-    private bool $disableMD5;
-
     private int $chunkSizeBytes;
 
     private ReadConcern $readConcern;
@@ -111,9 +105,6 @@ class Bucket
      *  * chunkSizeBytes (integer): The chunk size in bytes. Defaults to
      *    261120 (i.e. 255 KiB).
      *
-     *  * disableMD5 (boolean): When true, no MD5 sum will be generated for
-     *    each stored file. Defaults to "false".
-     *
      *  * readConcern (MongoDB\Driver\ReadConcern): Read concern.
      *
      *  * readPreference (MongoDB\Driver\ReadPreference): Read preference.
@@ -129,14 +120,9 @@ class Bucket
      */
     public function __construct(private Manager $manager, private string $databaseName, array $options = [])
     {
-        if (isset($options['disableMD5']) && $options['disableMD5'] === false) {
-            @trigger_error('Setting GridFS "disableMD5" option to "false" is deprecated since mongodb/mongodb 1.18 and will not be supported in version 2.0.', E_USER_DEPRECATED);
-        }
-
         $options += [
             'bucketName' => self::DEFAULT_BUCKET_NAME,
             'chunkSizeBytes' => self::DEFAULT_CHUNK_SIZE_BYTES,
-            'disableMD5' => false,
         ];
 
         if (! is_string($options['bucketName'])) {
@@ -155,10 +141,6 @@ public function __construct(private Manager $manager, private string $databaseNa
             throw InvalidArgumentException::invalidType('"codec" option', $options['codec'], DocumentCodec::class);
         }
 
-        if (! is_bool($options['disableMD5'])) {
-            throw InvalidArgumentException::invalidType('"disableMD5" option', $options['disableMD5'], 'boolean');
-        }
-
         if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
             throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
         }
@@ -182,7 +164,6 @@ public function __construct(private Manager $manager, private string $databaseNa
         $this->bucketName = $options['bucketName'];
         $this->chunkSizeBytes = $options['chunkSizeBytes'];
         $this->codec = $options['codec'] ?? null;
-        $this->disableMD5 = $options['disableMD5'];
         $this->readConcern = $options['readConcern'] ?? $this->manager->getReadConcern();
         $this->readPreference = $options['readPreference'] ?? $this->manager->getReadPreference();
         $this->typeMap = $options['typeMap'] ?? self::DEFAULT_TYPE_MAP;
@@ -211,7 +192,6 @@ public function __debugInfo()
             'bucketName' => $this->bucketName,
             'codec' => $this->codec,
             'databaseName' => $this->databaseName,
-            'disableMD5' => $this->disableMD5,
             'manager' => $this->manager,
             'chunkSizeBytes' => $this->chunkSizeBytes,
             'readConcern' => $this->readConcern,
@@ -565,9 +545,6 @@ public function openDownloadStreamByName(string $filename, array $options = [])
      *  * 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.
      *
@@ -579,7 +556,6 @@ public function openUploadStream(string $filename, array $options = [])
     {
         $options += [
             'chunkSizeBytes' => $this->chunkSizeBytes,
-            'disableMD5' => $this->disableMD5,
         ];
 
         $path = $this->createPathForUpload();
@@ -658,9 +634,6 @@ public function rename(mixed $id, string $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.
      *
@@ -792,9 +765,9 @@ private function registerStreamWrapper(): void
      *
      * @see StreamWrapper::setContextResolver()
      *
-     * @param string                                                         $path    The full url provided to fopen(). It contains the filename.
-     *                                                                                gridfs://database_name/collection_name.files/file_name
-     * @param array{revision?: int, chunkSizeBytes?: int, disableMD5?: bool} $context The options provided to fopen()
+     * @param string                                      $path    The full url provided to fopen(). It contains the filename.
+     *                                                             gridfs://database_name/collection_name.files/file_name
+     * @param array{revision?: int, chunkSizeBytes?: int} $context The options provided to fopen()
      *
      * @return array{collectionWrapper: CollectionWrapper, file: object}|array{collectionWrapper: CollectionWrapper, filename: string, options: array}
      *
@@ -825,7 +798,6 @@ private function resolveStreamContext(string $path, string $mode, array $context
                 'filename' => $filename,
                 'options' => $context + [
                     'chunkSizeBytes' => $this->chunkSizeBytes,
-                    'disableMD5' => $this->disableMD5,
                 ],
             ];
         }

src/Builder/Expression/RoundOperator.php

@@ -17,22 +17,15 @@
 
 namespace MongoDB\GridFS;
 
-use HashContext;
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Exception\InvalidArgumentException;
 
 use function array_intersect_key;
-use function hash_final;
-use function hash_init;
-use function hash_update;
-use function is_bool;
 use function is_integer;
-use function is_string;
 use function MongoDB\is_document;
-use function MongoDB\is_string_array;
 use function sprintf;
 use function strlen;
 use function substr;
@@ -52,12 +45,8 @@ final class WritableStream
 
     private int $chunkSize;
 
-    private bool $disableMD5;
-
     private array $file;
 
-    private ?HashContext $hashCtx = null;
-
     private bool $isClosed = false;
 
     private int $length = 0;
@@ -69,19 +58,9 @@ final class WritableStream
      *
      *  * _id (mixed): File document identifier. Defaults to a new ObjectId.
      *
-     *  * aliases (array of strings): DEPRECATED An array of aliases.
-     *    Applications wishing to store aliases should add an aliases field to
-     *    the metadata document instead.
-     *
      *  * chunkSizeBytes (integer): The chunk size in bytes. Defaults to
      *    261120 (i.e. 255 KiB).
      *
-     *  * disableMD5 (boolean): When true, no MD5 sum will be generated.
-     *    Defaults to "false".
-     *
-     *  * contentType (string): DEPRECATED content type to be stored with the
-     *    file. This information should now be added to the metadata.
-     *
      *  * metadata (document): User data for the "metadata" field of the files
      *    collection document.
      *
@@ -95,13 +74,8 @@ public function __construct(private CollectionWrapper $collectionWrapper, string
         $options += [
             '_id' => new ObjectId(),
             'chunkSizeBytes' => self::DEFAULT_CHUNK_SIZE_BYTES,
-            'disableMD5' => false,
         ];
 
-        if (isset($options['aliases']) && ! is_string_array($options['aliases'])) {
-            throw InvalidArgumentException::invalidType('"aliases" option', $options['aliases'], 'array of strings');
-        }
-
         if (! is_integer($options['chunkSizeBytes'])) {
             throw InvalidArgumentException::invalidType('"chunkSizeBytes" option', $options['chunkSizeBytes'], 'integer');
         }
@@ -110,32 +84,18 @@ public function __construct(private CollectionWrapper $collectionWrapper, string
             throw new InvalidArgumentException(sprintf('Expected "chunkSizeBytes" option to be >= 1, %d given', $options['chunkSizeBytes']));
         }
 
-        if (! is_bool($options['disableMD5'])) {
-            throw InvalidArgumentException::invalidType('"disableMD5" option', $options['disableMD5'], 'boolean');
-        }
-
-        if (isset($options['contentType']) && ! is_string($options['contentType'])) {
-            throw InvalidArgumentException::invalidType('"contentType" option', $options['contentType'], 'string');
-        }
-
         if (isset($options['metadata']) && ! is_document($options['metadata'])) {
             throw InvalidArgumentException::expectedDocumentType('"metadata" option', $options['metadata']);
         }
 
         $this->chunkSize = $options['chunkSizeBytes'];
-        $this->disableMD5 = $options['disableMD5'];
-
-        if (! $this->disableMD5) {
-            $this->hashCtx = hash_init('md5');
-        }
-
         $this->file = [
             '_id' => $options['_id'],
             'chunkSize' => $this->chunkSize,
             'filename' => $filename,
             'length' => null,
             'uploadDate' => null,
-        ] + array_intersect_key($options, ['aliases' => 1, 'contentType' => 1, 'metadata' => 1]);
+        ] + array_intersect_key($options, ['metadata' => 1]);
     }
 
     /**
@@ -248,10 +208,6 @@ private function fileCollectionInsert(): void
         $this->file['length'] = $this->length;
         $this->file['uploadDate'] = new UTCDateTime();
 
-        if (! $this->disableMD5 && $this->hashCtx) {
-            $this->file['md5'] = hash_final($this->hashCtx);
-        }
-
         try {
             $this->collectionWrapper->insertFile($this->file);
         } catch (DriverRuntimeException $e) {
@@ -276,10 +232,6 @@ private function insertChunkFromBuffer(): void
             'data' => new Binary($data),
         ];
 
-        if (! $this->disableMD5 && $this->hashCtx) {
-            hash_update($this->hashCtx, $data);
-        }
-
         try {
             $this->collectionWrapper->insertChunk($chunk);
         } catch (DriverRuntimeException $e) {