Revise docs and exception output

Author: jmikola

docs/includes/apiargs-MongoDBDatabase-method-createEncryptedCollection-param.yaml

@@ -30,7 +30,7 @@ name: $masterKey
 type: array|null
 description: |
   KMS-specific key options that will be used to encrypt new data keys. This
-  corresponds to the ``$masterKey`` parameter for
+  corresponds to the ``masterKey`` option for
   :php:`MongoDB\\Driver\\ClientEncryption::createDataKey() <mongodb-driver-clientencryption.createdatakey>`.
 
   If ``$kmsProvider`` is "local", this should be ``null``.

docs/reference/exception-classes.txt

@@ -37,9 +37,9 @@ MongoDB\\Exception\\CreateEncryptedCollectionException
 
    Thrown by :phpmethod:`MongoDB\\Database::createEncryptedCollection()` if any
    error is encountered while creating data keys or invoking
-   ``createCollection()``. The original exception and modified
-   ``encryptedFields`` option can be accessed via ``getPrevious()`` and
-   ``getEncryptedFields()``, respectively.
+   :phpmethod:`createCollection() <MongoDB\\Database::createCollection()>`. The
+   original exception and modified ``encryptedFields`` option can be accessed
+   via the ``getPrevious()`` and ``getEncryptedFields()`` methods, respectively.
 
    This class extends the library's :phpclass:`RuntimeException
    <MongoDB\\Exception\\RuntimeException>` class.

docs/reference/method/MongoDBDatabase-createEncryptedCollection.txt

@@ -21,7 +21,7 @@ Definition
 
    .. code-block:: php
 
-      function createEncryptedCollection(string $collectionName, ClientEncryption $clientEncryption, string $kmsProvider, ?array $masterKey, array $options): array
+      function createEncryptedCollection(string $collectionName, MongoDB\Driver\ClientEncryption $clientEncryption, string $kmsProvider, ?array $masterKey, array $options): array
 
    This method wraps :phpmethod:`MongoDB\\Database::createCollection()` and will 
    automatically create data keys for any encrypted fields where the ``keyId``

src/Database.php

@@ -305,29 +305,28 @@ public function createCollection(string $collectionName, array $options = [])
     }
 
     /**
-     * Create a new encrypted collection.
+     * Create a new encrypted collection explicitly.
      *
      * This function will automatically create data keys for any encrypted
      * fields where the "keyId" option is null. This function will return a copy
      * of the modified "encryptedFields" option in addition to the result from
-     * createCollection().
-     *
-     * This function requires that the "encryptedFields" option be specified.
+     * createCollection(). The "encryptedFields" option is required.
      *
      * If any error is encountered while creating data keys or invoking
      * createCollection(), a CreateEncryptedCollectionException will be thrown.
      * The original exception and modified "encryptedFields" option can be
-     * accessed via getPrevious() and getEncryptedFields(), respectively.
+     * accessed via the getPrevious() and getEncryptedFields() methods,
+     * respectively.
      *
      * @see CreateCollection::__construct() for supported options
      * @return array A tuple consisting of the createCollection() result and modified "encryptedFields" option
      * @throws InvalidArgumentException for parameter/option parsing errors
-     * @throws CreateEncryptedCollectionException for errors generating data keys or invoking createCollection
+     * @throws CreateEncryptedCollectionException for any errors creating data keys or invoking createCollection()
      */
     public function createEncryptedCollection(string $collectionName, ClientEncryption $clientEncryption, string $kmsProvider, ?array $masterKey, array $options): array
     {
         if (! isset($options['encryptedFields']) || ! is_array($options['encryptedFields']) && ! is_object($options['encryptedFields'])) {
-            throw InvalidArgumentException::invalidType('"encryptedFields" option', $options['encryptedFields'] ?? null, 'array or object');
+            throw InvalidArgumentException::invalidType('"encryptedFields" option', $options['encryptedFields'] ?? null, ['array', 'object']);
         }
 
         $encryptedFields = (array) recursive_copy($options['encryptedFields']);