Skip to content

Commit af0f962

Browse files
committed
Relax writeConcern option checks in operation classes
We only use the writeConcern option if isset() return true, so we needn't complain about users passing a null value.
1 parent b5be919 commit af0f962

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/Operation/BulkWrite.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public function __construct($databaseName, $collectionName, array $operations, a
188188
throw new InvalidArgumentTypeException('"ordered" option', $options['ordered'], 'boolean');
189189
}
190190

191-
if (array_key_exists('writeConcern', $options) && ! $options['writeConcern'] instanceof WriteConcern) {
191+
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
192192
throw new InvalidArgumentTypeException('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
193193
}
194194

src/Operation/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct($databaseName, $collectionName, $filter, $limit, arr
5252
throw new InvalidArgumentException('$limit must be 0 or 1');
5353
}
5454

55-
if (array_key_exists('writeConcern', $options) && ! $options['writeConcern'] instanceof WriteConcern) {
55+
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
5656
throw new InvalidArgumentTypeException('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
5757
}
5858

src/Operation/InsertMany.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct($databaseName, $collectionName, array $documents, ar
6868
throw new InvalidArgumentTypeException('"ordered" option', $options['ordered'], 'boolean');
6969
}
7070

71-
if (array_key_exists('writeConcern', $options) && ! $options['writeConcern'] instanceof WriteConcern) {
71+
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
7272
throw new InvalidArgumentTypeException('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
7373
}
7474

src/Operation/InsertOne.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct($databaseName, $collectionName, $document, array $op
4141
throw new InvalidArgumentTypeException('$document', $document, 'array or object');
4242
}
4343

44-
if (array_key_exists('writeConcern', $options) && ! $options['writeConcern'] instanceof WriteConcern) {
44+
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
4545
throw new InvalidArgumentTypeException('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
4646
}
4747

src/Operation/Update.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function __construct($databaseName, $collectionName, $filter, $update, ar
7575
throw new InvalidArgumentTypeException('"upsert" option', $options['upsert'], 'boolean');
7676
}
7777

78-
if (array_key_exists('writeConcern', $options) && ! $options['writeConcern'] instanceof WriteConcern) {
78+
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
7979
throw new InvalidArgumentTypeException('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
8080
}
8181

0 commit comments

Comments
 (0)