Merge v1.x into v2.x (#1607)

Author: mongodb-php-bot

tests/UnifiedSpecTests/UnifiedSpecTest.php

@@ -43,7 +43,6 @@ class UnifiedSpecTest extends FunctionalTestCase
         'crud/replaceOne-sort' => 'Sort for replace operations is not supported (PHPLIB-1492)',
         'crud/updateOne-sort' => 'Sort for update operations is not supported (PHPLIB-1492)',
         'crud/bypassDocumentValidation' => 'bypassDocumentValidation is handled by libmongoc (PHPLIB-1576)',
-        'crud/distinct-hint' => 'Hint for distinct operations is not supported (PHPLIB-1582)',
     ];
 
     /** @var array<string, string> */

tests/UnifiedSpecTests/Util.php

@@ -98,7 +98,7 @@ final class Util
             'deleteMany' => ['let', 'filter', 'session', 'collation', 'hint', 'comment'],
             'deleteOne' => ['let', 'filter', 'session', 'collation', 'hint', 'comment'],
             'findOneAndDelete' => ['let', 'filter', 'session', 'projection', 'arrayFilters', 'bypassDocumentValidation', 'collation', 'hint', 'maxTimeMS', 'new', 'sort', 'update', 'upsert', 'comment'],
-            'distinct' => ['fieldName', 'filter', 'session', 'collation', 'maxTimeMS', 'comment'],
+            'distinct' => ['fieldName', 'filter', 'session', 'collation', 'maxTimeMS', 'comment', 'hint'],
             'drop' => ['session', 'comment'],
             'dropSearchIndex' => ['name'],
             'find' => ['let', 'filter', 'session', 'allowDiskUse', 'allowPartialResults', 'batchSize', 'collation', 'comment', 'cursorType', 'hint', 'limit', 'max', 'maxAwaitTimeMS', 'maxTimeMS', 'min', 'noCursorTimeout', 'projection', 'returnKey', 'showRecordId', 'skip', 'sort'],