Skip to content

Commit 2a77dfb

Browse files
alcaeusalcaeus
committed
Fix breakage introduced by constructor property promotion
1 parent dad88c1 commit 2a77dfb

17 files changed

+26
-26
lines changed

‎src/Model/BSONIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function __construct(string $data, private array $options = [])
122122
}
123123

124124
if (! isset($options['typeMap'])) {
125-
$options['typeMap'] = [];
125+
$this->options['typeMap'] = [];
126126
}
127127

128128
$this->buffer = $data;

‎src/Model/IndexInput.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public function __construct(private array $index)
6161
}
6262

6363
if (! isset($index['name'])) {
64-
$index['name'] = $this->generateIndexName($index['key']);
64+
$this->index['name'] = $this->generateIndexName($index['key']);
6565
}
6666

67-
if (! is_string($index['name'])) {
68-
throw InvalidArgumentException::invalidType('"name" option', $index['name'], 'string');
67+
if (! is_string($this->index['name'])) {
68+
throw InvalidArgumentException::invalidType('"name" option', $this->index['name'], 'string');
6969
}
7070
}
7171

‎src/Operation/Aggregate.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ public function __construct(private string $databaseName, private ?string $colle
185185
}
186186

187187
if (isset($options['bypassDocumentValidation']) && ! $options['bypassDocumentValidation']) {
188-
unset($options['bypassDocumentValidation']);
188+
unset($this->options['bypassDocumentValidation']);
189189
}
190190

191191
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {
192-
unset($options['readConcern']);
192+
unset($this->options['readConcern']);
193193
}
194194

195195
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
196-
unset($options['writeConcern']);
196+
unset($this->options['writeConcern']);
197197
}
198198

199199
if (isset($options['codec']) && isset($options['typeMap'])) {
@@ -205,9 +205,9 @@ public function __construct(private string $databaseName, private ?string $colle
205205
if ($this->isWrite) {
206206
/* Ignore batchSize for writes, since no documents are returned and
207207
* a batchSize of zero could prevent the pipeline from executing. */
208-
unset($options['batchSize']);
208+
unset($this->options['batchSize']);
209209
} else {
210-
unset($options['writeConcern']);
210+
unset($this->options['writeConcern']);
211211
}
212212
}
213213

‎src/Operation/Count.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function __construct(private string $databaseName, private string $collec
117117
}
118118

119119
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {
120-
unset($options['readConcern']);
120+
unset($this->options['readConcern']);
121121
}
122122
}
123123

‎src/Operation/CreateCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function __construct(private string $databaseName, private string $collec
224224
}
225225

226226
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
227-
unset($options['writeConcern']);
227+
unset($this->options['writeConcern']);
228228
}
229229

230230
if (isset($options['autoIndexId'])) {

‎src/Operation/CreateIndexes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function __construct(private string $databaseName, private string $collec
109109
}
110110

111111
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
112-
unset($options['writeConcern']);
112+
unset($this->options['writeConcern']);
113113
}
114114
}
115115

‎src/Operation/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function __construct(private string $databaseName, private string $collec
113113
}
114114

115115
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
116-
unset($options['writeConcern']);
116+
unset($this->options['writeConcern']);
117117
}
118118
}
119119

‎src/Operation/Distinct.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function __construct(private string $databaseName, private string $collec
102102
}
103103

104104
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {
105-
unset($options['readConcern']);
105+
unset($this->options['readConcern']);
106106
}
107107
}
108108

‎src/Operation/DropCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct(private string $databaseName, private string $collec
7676
}
7777

7878
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
79-
unset($options['writeConcern']);
79+
unset($this->options['writeConcern']);
8080
}
8181
}
8282

‎src/Operation/DropDatabase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function __construct(private string $databaseName, private array $options
7171
}
7272

7373
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
74-
unset($options['writeConcern']);
74+
unset($this->options['writeConcern']);
7575
}
7676
}
7777

‎src/Operation/DropIndexes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function __construct(private string $databaseName, private string $collec
8585
}
8686

8787
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
88-
unset($options['writeConcern']);
88+
unset($this->options['writeConcern']);
8989
}
9090
}
9191

‎src/Operation/Find.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public function __construct(private string $databaseName, private string $collec
280280
}
281281

282282
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {
283-
unset($options['readConcern']);
283+
unset($this->options['readConcern']);
284284
}
285285

286286
if (isset($options['snapshot'])) {

‎src/Operation/InsertOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ public function __construct(private string $databaseName, private string $collec
8484
}
8585

8686
if (isset($options['bypassDocumentValidation']) && ! $options['bypassDocumentValidation']) {
87-
unset($options['bypassDocumentValidation']);
87+
unset($this->options['bypassDocumentValidation']);
8888
}
8989

9090
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
91-
unset($options['writeConcern']);
91+
unset($this->options['writeConcern']);
9292
}
9393

9494
$this->document = $this->validateDocument($document, $options['codec'] ?? null);

‎src/Operation/MapReduce.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,15 @@ public function __construct(private string $databaseName, private string $collec
208208
}
209209

210210
if (isset($options['bypassDocumentValidation']) && ! $options['bypassDocumentValidation']) {
211-
unset($options['bypassDocumentValidation']);
211+
unset($this->options['bypassDocumentValidation']);
212212
}
213213

214214
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {
215-
unset($options['readConcern']);
215+
unset($this->options['readConcern']);
216216
}
217217

218218
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
219-
unset($options['writeConcern']);
219+
unset($this->options['writeConcern']);
220220
}
221221

222222
// Handle deprecation of CodeWScope

‎src/Operation/ModifyCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct(private string $databaseName, private string $collec
7676
}
7777

7878
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
79-
unset($options['writeConcern']);
79+
unset($this->options['writeConcern']);
8080
}
8181
}
8282

‎src/Operation/RenameCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function __construct(string $fromDatabaseName, string $fromCollectionName
8383
}
8484

8585
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {
86-
unset($options['writeConcern']);
86+
unset($this->options['writeConcern']);
8787
}
8888

8989
if (isset($options['dropTarget']) && ! is_bool($options['dropTarget'])) {

‎tests/ExamplesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ public static function provideExamples(): Generator
144144
[oid] => %s
145145
)
146146
147-
[name] => alcaeus
148147
[emails] => Array
149148
(
150149
[0] => MongoDB\Examples\Persistable\PersistableEmail Object
@@ -161,6 +160,7 @@ public static function provideExamples(): Generator
161160
162161
)
163162
163+
[name] => alcaeus
164164
)
165165
OUTPUT;
166166

0 commit comments

Comments
 (0)