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

Author: mongodb-php-bot

src/Client.php

@@ -88,7 +88,7 @@ class Client
      *
      * Supported driver-specific options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * typeMap (array): Default type map for cursors and BSON documents.

src/Collection.php

@@ -108,7 +108,7 @@ class Collection
      *
      * Supported options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * codec (MongoDB\Codec\DocumentCodec): Codec used to decode documents

src/Database.php

@@ -85,7 +85,7 @@ class Database
      *
      * Supported options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * readConcern (MongoDB\Driver\ReadConcern): The default read concern to

src/Operation/BulkWrite.php

@@ -96,7 +96,7 @@ final class BulkWrite
      *
      * Supported options for the bulk write operation:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * bypassDocumentValidation (boolean): If true, allows the write to