Skip to content

Commit 76b24d7

Browse files
alcaeusalcaeus
committed
PHPLIB-362: Prefer class name constant over string literals
1 parent 3b21801 commit 76b24d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+210
-209
lines changed

‎src/Client.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
class Client
3636
{
3737
private static $defaultTypeMap = [
38-
'array' => 'MongoDB\Model\BSONArray',
39-
'document' => 'MongoDB\Model\BSONDocument',
40-
'root' => 'MongoDB\Model\BSONDocument',
38+
'array' => \MongoDB\Model\BSONArray::class,
39+
'document' => \MongoDB\Model\BSONDocument::class,
40+
'root' => \MongoDB\Model\BSONDocument::class,
4141
];
4242
private static $wireVersionForReadConcern = 4;
4343
private static $wireVersionForWritableCommandWriteConcern = 5;

‎src/Collection.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
class Collection
6363
{
6464
private static $defaultTypeMap = [
65-
'array' => 'MongoDB\Model\BSONArray',
66-
'document' => 'MongoDB\Model\BSONDocument',
67-
'root' => 'MongoDB\Model\BSONDocument',
65+
'array' => \MongoDB\Model\BSONArray::class,
66+
'document' => \MongoDB\Model\BSONDocument::class,
67+
'root' => \MongoDB\Model\BSONDocument::class,
6868
];
6969
private static $wireVersionForFindAndModifyWriteConcern = 4;
7070
private static $wireVersionForReadConcern = 4;
@@ -117,19 +117,19 @@ public function __construct(Manager $manager, $databaseName, $collectionName, ar
117117
}
118118

119119
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
120-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
120+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
121121
}
122122

123123
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
124-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
124+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
125125
}
126126

127127
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
128128
throw InvalidArgumentException::invalidType('"typeMap" option', $options['typeMap'], 'array');
129129
}
130130

131131
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
132-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
132+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
133133
}
134134

135135
$this->manager = $manager;

‎src/Database.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
class Database
4343
{
4444
private static $defaultTypeMap = [
45-
'array' => 'MongoDB\Model\BSONArray',
46-
'document' => 'MongoDB\Model\BSONDocument',
47-
'root' => 'MongoDB\Model\BSONDocument',
45+
'array' => \MongoDB\Model\BSONArray::class,
46+
'document' => \MongoDB\Model\BSONDocument::class,
47+
'root' => \MongoDB\Model\BSONDocument::class,
4848
];
4949
private static $wireVersionForReadConcern = 4;
5050
private static $wireVersionForWritableCommandWriteConcern = 5;
@@ -91,19 +91,19 @@ public function __construct(Manager $manager, $databaseName, array $options = []
9191
}
9292

9393
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
94-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
94+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
9595
}
9696

9797
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
98-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
98+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
9999
}
100100

101101
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
102102
throw InvalidArgumentException::invalidType('"typeMap" option', $options['typeMap'], 'array');
103103
}
104104

105105
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
106-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
106+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
107107
}
108108

109109
$this->manager = $manager;

‎src/GridFS/Bucket.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class Bucket
4242
private static $defaultBucketName = 'fs';
4343
private static $defaultChunkSizeBytes = 261120;
4444
private static $defaultTypeMap = [
45-
'array' => 'MongoDB\Model\BSONArray',
46-
'document' => 'MongoDB\Model\BSONDocument',
47-
'root' => 'MongoDB\Model\BSONDocument',
45+
'array' => \MongoDB\Model\BSONArray::class,
46+
'document' => \MongoDB\Model\BSONDocument::class,
47+
'root' => \MongoDB\Model\BSONDocument::class,
4848
];
4949
private static $streamWrapperProtocol = 'gridfs';
5050

@@ -111,19 +111,19 @@ public function __construct(Manager $manager, $databaseName, array $options = []
111111
}
112112

113113
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
114-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
114+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
115115
}
116116

117117
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
118-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
118+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
119119
}
120120

121121
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
122122
throw InvalidArgumentException::invalidType('"typeMap" option', $options['typeMap'], 'array');
123123
}
124124

125125
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
126-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
126+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
127127
}
128128

129129
$this->manager = $manager;
@@ -639,7 +639,7 @@ private function getRawFileDocumentForStream($stream)
639639
$metadata = stream_get_meta_data($stream);
640640

641641
if ( ! isset ($metadata['wrapper_data']) || ! $metadata['wrapper_data'] instanceof StreamWrapper) {
642-
throw InvalidArgumentException::invalidType('$stream wrapper data', isset($metadata['wrapper_data']) ? $metadata['wrapper_data'] : null, 'MongoDB\Driver\GridFS\StreamWrapper');
642+
throw InvalidArgumentException::invalidType('$stream wrapper data', isset($metadata['wrapper_data']) ? $metadata['wrapper_data'] : null, StreamWrapper::class);
643643
}
644644

645645
return $metadata['wrapper_data']->getFile();

‎src/Operation/Aggregate.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,15 @@ public function __construct($databaseName, $collectionName, array $pipeline, arr
182182
}
183183

184184
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
185-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
185+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
186186
}
187187

188188
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
189-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
189+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
190190
}
191191

192192
if (isset($options['session']) && ! $options['session'] instanceof Session) {
193-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
193+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
194194
}
195195

196196
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
@@ -202,7 +202,7 @@ public function __construct($databaseName, $collectionName, array $pipeline, arr
202202
}
203203

204204
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
205-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
205+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
206206
}
207207

208208
if (isset($options['batchSize']) && ! $options['useCursor']) {

‎src/Operation/BulkWrite.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ public function __construct($databaseName, $collectionName, array $operations, a
286286
}
287287

288288
if (isset($options['session']) && ! $options['session'] instanceof Session) {
289-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
289+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
290290
}
291291

292292
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
293-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
293+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
294294
}
295295

296296
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

‎src/Operation/Count.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ public function __construct($databaseName, $collectionName, $filter = [], array
106106
}
107107

108108
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
109-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
109+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
110110
}
111111

112112
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
113-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
113+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
114114
}
115115

116116
if (isset($options['session']) && ! $options['session'] instanceof Session) {
117-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
117+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
118118
}
119119

120120
if (isset($options['skip']) && ! is_integer($options['skip'])) {

‎src/Operation/CountDocuments.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ public function __construct($databaseName, $collectionName, $filter, array $opti
106106
}
107107

108108
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
109-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
109+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
110110
}
111111

112112
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
113-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
113+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
114114
}
115115

116116
if (isset($options['session']) && ! $options['session'] instanceof Session) {
117-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
117+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
118118
}
119119

120120
if (isset($options['skip']) && ! is_integer($options['skip'])) {

‎src/Operation/CreateCollection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function __construct($databaseName, $collectionName, array $options = [])
139139
}
140140

141141
if (isset($options['session']) && ! $options['session'] instanceof Session) {
142-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
142+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
143143
}
144144

145145
if (isset($options['size']) && ! is_integer($options['size'])) {
@@ -167,7 +167,7 @@ public function __construct($databaseName, $collectionName, array $options = [])
167167
}
168168

169169
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
170-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
170+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
171171
}
172172

173173
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

‎src/Operation/CreateIndexes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public function __construct($databaseName, $collectionName, array $indexes, arra
104104
}
105105

106106
if (isset($options['session']) && ! $options['session'] instanceof Session) {
107-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
107+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
108108
}
109109

110110
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
111-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
111+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
112112
}
113113

114114
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

‎src/Operation/DatabaseCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ public function __construct($databaseName, $command, array $options = [])
6666
}
6767

6868
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
69-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
69+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
7070
}
7171

7272
if (isset($options['session']) && ! $options['session'] instanceof Session) {
73-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
73+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
7474
}
7575

7676
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {

‎src/Operation/Delete.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ public function __construct($databaseName, $collectionName, $filter, $limit, arr
8585
}
8686

8787
if (isset($options['session']) && ! $options['session'] instanceof Session) {
88-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
88+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
8989
}
9090

9191
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
92-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
92+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
9393
}
9494

9595
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

‎src/Operation/Distinct.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ public function __construct($databaseName, $collectionName, $fieldName, $filter
9191
}
9292

9393
if (isset($options['readConcern']) && ! $options['readConcern'] instanceof ReadConcern) {
94-
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], 'MongoDB\Driver\ReadConcern');
94+
throw InvalidArgumentException::invalidType('"readConcern" option', $options['readConcern'], ReadConcern::class);
9595
}
9696

9797
if (isset($options['readPreference']) && ! $options['readPreference'] instanceof ReadPreference) {
98-
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
98+
throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], ReadPreference::class);
9999
}
100100

101101
if (isset($options['session']) && ! $options['session'] instanceof Session) {
102-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
102+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
103103
}
104104

105105
if (isset($options['readConcern']) && $options['readConcern']->isDefault()) {

‎src/Operation/DropCollection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ class DropCollection implements Executable
6767
public function __construct($databaseName, $collectionName, array $options = [])
6868
{
6969
if (isset($options['session']) && ! $options['session'] instanceof Session) {
70-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
70+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
7171
}
7272

7373
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
7474
throw InvalidArgumentException::invalidType('"typeMap" option', $options['typeMap'], 'array');
7575
}
7676

7777
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
78-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
78+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
7979
}
8080

8181
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

‎src/Operation/DropDatabase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ class DropDatabase implements Executable
6464
public function __construct($databaseName, array $options = [])
6565
{
6666
if (isset($options['session']) && ! $options['session'] instanceof Session) {
67-
throw InvalidArgumentException::invalidType('"session" option', $options['session'], 'MongoDB\Driver\Session');
67+
throw InvalidArgumentException::invalidType('"session" option', $options['session'], Session::class);
6868
}
6969

7070
if (isset($options['typeMap']) && ! is_array($options['typeMap'])) {
7171
throw InvalidArgumentException::invalidType('"typeMap" option', $options['typeMap'], 'array');
7272
}
7373

7474
if (isset($options['writeConcern']) && ! $options['writeConcern'] instanceof WriteConcern) {
75-
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], 'MongoDB\Driver\WriteConcern');
75+
throw InvalidArgumentException::invalidType('"writeConcern" option', $options['writeConcern'], WriteConcern::class);
7676
}
7777

7878
if (isset($options['writeConcern']) && $options['writeConcern']->isDefault()) {

0 commit comments

Comments
 (0)