Skip to content

Commit

Permalink
Merge v1.x into v2.x (#1595)
Browse files Browse the repository at this point in the history
  • Loading branch information
mongodb-php-bot authored Feb 10, 2025
2 parents 0bdbf47 + c129a46 commit 36cb899
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Operation/BulkWrite.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 36cb899

Please sign in to comment.