Completed
Pull Request — master (#213)
by Andreas
04:32
created
lib/Mongo/MongoClient.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
      * @link http://www.php.net/manual/en/mongoclient.killcursor.php
239 239
      * @param string $server_hash The server hash that has the cursor.
240 240
      * @param int|MongoInt64 $id The ID of the cursor to kill.
241
-     * @return bool
241
+     * @return boolean|null
242 242
      */
243 243
     public function killCursor($server_hash, $id)
244 244
     {
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
     }
351 351
 
352 352
     /**
353
-     * @return array
353
+     * @return string[]
354 354
      */
355 355
     public function __sleep()
356 356
     {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
     }
361 361
 
362 362
     /**
363
-     * @param $server
363
+     * @param string $server
364 364
      * @return array
365 365
      */
366 366
     private function extractUrlOptions($server)
Please login to merge, or discard this patch.
lib/Mongo/MongoGridFS.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function findOne($query = [], array $fields = [], array $options = [])
133 133
     {
134
-        if (! is_array($query)) {
134
+        if ( ! is_array($query)) {
135 135
             $query = ['filename' => (string) $query];
136 136
         }
137 137
 
@@ -244,10 +244,10 @@  discard block
 block discarded – undo
244 244
             ];
245 245
 
246 246
             $handle = fopen($filename, 'r');
247
-            if (! $handle) {
247
+            if ( ! $handle) {
248 248
                 throw new MongoGridFSException('could not open file: ' . $filename);
249 249
             }
250
-        } elseif (! is_resource($filename)) {
250
+        } elseif ( ! is_resource($filename)) {
251 251
             throw new \Exception('first argument must be a string or stream resource');
252 252
         } else {
253 253
             $handle = $filename;
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
 
271 271
         // Add length and MD5 if they were not present before
272 272
         $update = [];
273
-        if (! isset($record['length'])) {
273
+        if ( ! isset($record['length'])) {
274 274
             $update['length'] = $length;
275 275
         }
276
-        if (! isset($record['md5'])) {
276
+        if ( ! isset($record['md5'])) {
277 277
             try {
278 278
                 $update['md5'] = $md5;
279 279
             } catch (MongoException $e) {
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         if (count($update)) {
285 285
             try {
286 286
                 $result = $this->update(['_id' => $file['_id']], ['$set' => $update]);
287
-                if (! $this->isOKResult($result)) {
287
+                if ( ! $this->isOKResult($result)) {
288 288
                     throw new MongoGridFSException('Could not store file');
289 289
                 }
290 290
             } catch (MongoException $e) {
@@ -307,10 +307,10 @@  discard block
 block discarded – undo
307 307
      */
308 308
     public function storeUpload($name, array $metadata = [])
309 309
     {
310
-        if (! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
310
+        if ( ! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
311 311
             throw new MongoGridFSException("Could not find uploaded file $name");
312 312
         }
313
-        if (! isset($_FILES[$name]['tmp_name'])) {
313
+        if ( ! isset($_FILES[$name]['tmp_name'])) {
314 314
             throw new MongoGridFSException("Couldn't find tmp_name in the \$_FILES array. Are you sure the upload worked?");
315 315
         }
316 316
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 
361 361
         $result = $this->chunks->insert($chunk);
362 362
 
363
-        if (! $this->isOKResult($result)) {
363
+        if ( ! $this->isOKResult($result)) {
364 364
             throw new \MongoException('error inserting chunk');
365 365
         }
366 366
 
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
         $hash = hash_init('md5');
406 406
 
407 407
         rewind($handle);
408
-        while (! feof($handle)) {
408
+        while ( ! feof($handle)) {
409 409
             $data = stream_get_contents($handle, $chunkSize);
410 410
             hash_update($hash, $data);
411 411
             $this->insertChunk($fileId, $data, $i++);
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 
436 436
         $result = $this->insert($record, $options);
437 437
 
438
-        if (! $this->isOKResult($result)) {
438
+        if ( ! $this->isOKResult($result)) {
439 439
             throw new \MongoException('error inserting file');
440 440
         }
441 441
 
Please login to merge, or discard this patch.
lib/Mongo/MongoCollection.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
      */
131 131
     public function aggregate(array $pipeline, array $op = [])
132 132
     {
133
-        if (! TypeConverter::isNumericArray($pipeline)) {
133
+        if ( ! TypeConverter::isNumericArray($pipeline)) {
134 134
             $operators = func_get_args();
135 135
             $pipeline = [];
136 136
             $options = [];
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             $i = 0;
139 139
             foreach ($operators as $operator) {
140 140
                 $i++;
141
-                if (! is_array($operator)) {
141
+                if ( ! is_array($operator)) {
142 142
                     trigger_error("Argument $i is not an array", E_USER_WARNING);
143 143
                     return;
144 144
                 }
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         ];
192 192
 
193 193
         // Convert cursor option
194
-        if (! isset($options['cursor'])) {
194
+        if ( ! isset($options['cursor'])) {
195 195
             $options['cursor'] = new \stdClass();
196 196
         }
197 197
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
      */
278 278
     public function insert(&$a, array $options = [])
279 279
     {
280
-        if (! $this->ensureDocumentHasMongoId($a)) {
280
+        if ( ! $this->ensureDocumentHasMongoId($a)) {
281 281
             trigger_error(sprintf('%s(): expects parameter %d to be an array or object, %s given', __METHOD__, 1, gettype($a)), E_USER_WARNING);
282 282
             return;
283 283
         }
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
             throw ExceptionConverter::toLegacy($e);
294 294
         }
295 295
 
296
-        if (! $result->isAcknowledged()) {
296
+        if ( ! $result->isAcknowledged()) {
297 297
             return true;
298 298
         }
299 299
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 
325 325
         foreach ($a as $key => $item) {
326 326
             try {
327
-                if (! $this->ensureDocumentHasMongoId($a[$key])) {
327
+                if ( ! $this->ensureDocumentHasMongoId($a[$key])) {
328 328
                     if ($continueOnError) {
329 329
                         unset($a[$key]);
330 330
                     } else {
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
                     }
334 334
                 }
335 335
             } catch (MongoException $e) {
336
-                if (! $continueOnError) {
336
+                if ( ! $continueOnError) {
337 337
                     throw $e;
338 338
                 }
339 339
             }
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
             throw ExceptionConverter::toLegacy($e, 'MongoResultException');
349 349
         }
350 350
 
351
-        if (! $result->isAcknowledged()) {
351
+        if ( ! $result->isAcknowledged()) {
352 352
             return true;
353 353
         }
354 354
 
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
             throw ExceptionConverter::toLegacy($e);
403 403
         }
404 404
 
405
-        if (! $result->isAcknowledged()) {
405
+        if ( ! $result->isAcknowledged()) {
406 406
             return true;
407 407
         }
408 408
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
      */
430 430
     public function remove(array $criteria = [], array $options = [])
431 431
     {
432
-        $multiple = isset($options['justOne']) ? !$options['justOne'] : true;
432
+        $multiple = isset($options['justOne']) ? ! $options['justOne'] : true;
433 433
         $method = $multiple ? 'deleteMany' : 'deleteOne';
434 434
 
435 435
         try {
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
             throw ExceptionConverter::toLegacy($e);
443 443
         }
444 444
 
445
-        if (! $result->isAcknowledged()) {
445
+        if ( ! $result->isAcknowledged()) {
446 446
             return true;
447 447
         }
448 448
 
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 
521 521
                 $options['projection'] = TypeConverter::convertProjection($fields);
522 522
 
523
-                if (! \MongoDB\is_first_key_operator($update)) {
523
+                if ( ! \MongoDB\is_first_key_operator($update)) {
524 524
                     $document = $this->collection->findOneAndReplace($query, $update, $options);
525 525
                 } else {
526 526
                     $document = $this->collection->findOneAndUpdate($query, $update, $options);
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
     public function findOne($query = [], array $fields = [], array $options = [])
552 552
     {
553 553
         // Can't typehint for array since MongoGridFS extends and accepts strings
554
-        if (! is_array($query)) {
554
+        if ( ! is_array($query)) {
555 555
             trigger_error(sprintf('MongoCollection::findOne(): expects parameter 1 to be an array or object, %s given', gettype($query)), E_USER_WARNING);
556 556
             return;
557 557
         }
@@ -591,11 +591,11 @@  discard block
 block discarded – undo
591 591
             $keys = (array) $keys;
592 592
         }
593 593
 
594
-        if (! is_array($keys) || ! count($keys)) {
594
+        if ( ! is_array($keys) || ! count($keys)) {
595 595
             throw new MongoException('index specification has no elements');
596 596
         }
597 597
 
598
-        if (! isset($options['name'])) {
598
+        if ( ! isset($options['name'])) {
599 599
             $options['name'] = \MongoDB\generate_index_name($keys);
600 600
         }
601 601
 
@@ -630,14 +630,14 @@  discard block
 block discarded – undo
630 630
         }
631 631
 
632 632
         $result = [
633
-            'createdCollectionAutomatically' => !$collectionExists,
633
+            'createdCollectionAutomatically' => ! $collectionExists,
634 634
             'numIndexesBefore' => $indexCount,
635 635
             'numIndexesAfter' => $indexCount,
636 636
             'note' => 'all indexes already exist',
637 637
             'ok' => 1.0,
638 638
         ];
639 639
 
640
-        if (! $indexExists) {
640
+        if ( ! $indexExists) {
641 641
             $result['numIndexesAfter']++;
642 642
             unset($result['note']);
643 643
         }
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
     {
671 671
         if (is_string($keys)) {
672 672
             $indexName = $keys;
673
-            if (! preg_match('#_-?1$#', $indexName)) {
673
+            if ( ! preg_match('#_-?1$#', $indexName)) {
674 674
                 $indexName .= '_1';
675 675
             }
676 676
         } elseif (is_array($keys)) {
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
      */
710 710
     public function getIndexInfo()
711 711
     {
712
-        $convertIndex = function (\MongoDB\Model\IndexInfo $indexInfo) {
712
+        $convertIndex = function(\MongoDB\Model\IndexInfo $indexInfo) {
713 713
             $infos = [
714 714
                 'v' => $indexInfo->getVersion(),
715 715
                 'key' => $indexInfo->getKey(),
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
             ];
734 734
 
735 735
             foreach ($additionalKeys as $key) {
736
-                if (! isset($indexInfo[$key])) {
736
+                if ( ! isset($indexInfo[$key])) {
737 737
                     continue;
738 738
                 }
739 739
 
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
     {
759 759
         try {
760 760
             // Handle legacy mode - limit and skip as second and third parameters, respectively
761
-            if (! is_array($options)) {
761
+            if ( ! is_array($options)) {
762 762
                 $limit = $options;
763 763
                 $options = [];
764 764
 
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
                 $this->convertWriteConcernOptions($options)
806 806
             );
807 807
 
808
-            if (! $result->isAcknowledged()) {
808
+            if ( ! $result->isAcknowledged()) {
809 809
                 return true;
810 810
             }
811 811
 
@@ -839,13 +839,13 @@  discard block
 block discarded – undo
839 839
         if ($document_or_id instanceof \MongoId) {
840 840
             $id = $document_or_id;
841 841
         } elseif (is_object($document_or_id)) {
842
-            if (! isset($document_or_id->_id)) {
842
+            if ( ! isset($document_or_id->_id)) {
843 843
                 return null;
844 844
             }
845 845
 
846 846
             $id = $document_or_id->_id;
847 847
         } elseif (is_array($document_or_id)) {
848
-            if (! isset($document_or_id['_id'])) {
848
+            if ( ! isset($document_or_id['_id'])) {
849 849
                 return null;
850 850
             }
851 851
 
@@ -958,11 +958,11 @@  discard block
 block discarded – undo
958 958
             $options['w'] = ($options['safe']) ? 1 : 0;
959 959
         }
960 960
 
961
-        if (isset($options['wtimeout']) && !isset($options['wTimeoutMS'])) {
961
+        if (isset($options['wtimeout']) && ! isset($options['wTimeoutMS'])) {
962 962
             $options['wTimeoutMS'] = $options['wtimeout'];
963 963
         }
964 964
 
965
-        if (isset($options['w']) || !isset($options['wTimeoutMS'])) {
965
+        if (isset($options['w']) || ! isset($options['wTimeoutMS'])) {
966 966
             $collectionWriteConcern = $this->getWriteConcern();
967 967
             $writeConcern = $this->createWriteConcernFromParameters(
968 968
                 isset($options['w']) ? $options['w'] : $collectionWriteConcern['w'],
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
     private function ensureDocumentHasMongoId(&$document)
1001 1001
     {
1002 1002
         if (is_array($document)) {
1003
-            if (! isset($document['_id'])) {
1003
+            if ( ! isset($document['_id'])) {
1004 1004
                 $document['_id'] = new \MongoId();
1005 1005
             }
1006 1006
 
@@ -1010,12 +1010,12 @@  discard block
 block discarded – undo
1010 1010
         } elseif (is_object($document)) {
1011 1011
             $reflectionObject = new \ReflectionObject($document);
1012 1012
             foreach ($reflectionObject->getProperties() as $property) {
1013
-                if (! $property->isPublic()) {
1013
+                if ( ! $property->isPublic()) {
1014 1014
                     throw new \MongoException('zero-length keys are not allowed, did you use $ with double quotes?');
1015 1015
                 }
1016 1016
             }
1017 1017
 
1018
-            if (! isset($document->_id)) {
1018
+            if ( ! isset($document->_id)) {
1019 1019
                 $document->_id = new \MongoId();
1020 1020
             }
1021 1021
 
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 
1047 1047
     private function mustBeArrayOrObject($a)
1048 1048
     {
1049
-        if (!is_array($a) && !is_object($a)) {
1049
+        if ( ! is_array($a) && ! is_object($a)) {
1050 1050
             throw new \MongoException('document must be an array or object');
1051 1051
         }
1052 1052
     }
Please login to merge, or discard this patch.
lib/Mongo/MongoDB.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             throw ExceptionConverter::toLegacy($e);
143 143
         }
144 144
 
145
-        $getCollectionInfo = function (CollectionInfo $collectionInfo) {
145
+        $getCollectionInfo = function(CollectionInfo $collectionInfo) {
146 146
             // @todo do away with __debugInfo once https://jira.mongodb.org/browse/PHPLIB-226 is fixed
147 147
             $info = $collectionInfo->__debugInfo();
148 148
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
                     'info' => isset($info['info']) ? (array) $info['info'] : null,
155 155
                     'idIndex' => isset($info['idIndex']) ? (array) $info['idIndex'] : null,
156 156
                 ],
157
-                function ($item) {
157
+                function($item) {
158 158
                     return $item !== null;
159 159
                 }
160 160
             );
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
             throw ExceptionConverter::toLegacy($e);
191 191
         }
192 192
 
193
-        $getCollectionName = function (CollectionInfo $collectionInfo) {
193
+        $getCollectionName = function(CollectionInfo $collectionInfo) {
194 194
             return $collectionInfo->getName();
195 195
         };
196 196
 
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
         if ($document_or_id instanceof \MongoId) {
360 360
             $id = $document_or_id;
361 361
         } elseif (is_object($document_or_id)) {
362
-            if (! isset($document_or_id->_id)) {
362
+            if ( ! isset($document_or_id->_id)) {
363 363
                 $id = $document_or_id;
364 364
             } else {
365 365
                 $id = $document_or_id->_id;
366 366
             }
367 367
         } elseif (is_array($document_or_id)) {
368
-            if (! isset($document_or_id['_id'])) {
368
+            if ( ! isset($document_or_id['_id'])) {
369 369
                 return null;
370 370
             }
371 371
 
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
      */
554 554
     private function getSystemCollectionFilterClosure($includeSystemCollections = false)
555 555
     {
556
-        return function (CollectionInfo $collectionInfo) use ($includeSystemCollections) {
556
+        return function(CollectionInfo $collectionInfo) use ($includeSystemCollections) {
557 557
             return $includeSystemCollections || ! preg_match('#^system\.#', $collectionInfo->getName());
558 558
         };
559 559
     }
Please login to merge, or discard this patch.
lib/Mongo/MongoWriteBatch.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     final public function execute(array $writeOptions = [])
103 103
     {
104 104
         $writeOptions += $this->writeOptions;
105
-        if (! count($this->items)) {
105
+        if ( ! count($this->items)) {
106 106
             return ['ok' => true];
107 107
         }
108 108
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
                 break;
168 168
         }
169 169
 
170
-        if (! $ok) {
170
+        if ( ! $ok) {
171 171
             // Exception code is hardcoded to the value in ext-mongo, see
172 172
             // https://github.com/mongodb/mongo-php-driver-legacy/blob/ab4bc0d90e93b3f247f6bcb386d0abc8d2fa7d74/batch/write.c#L428
173 173
             throw new \MongoWriteConcernException('Failed write', 911, null, $resultDocument);
@@ -180,19 +180,19 @@  discard block
 block discarded – undo
180 180
     {
181 181
         switch ($this->batchType) {
182 182
             case self::COMMAND_UPDATE:
183
-                if (! isset($item['q'])) {
183
+                if ( ! isset($item['q'])) {
184 184
                     throw new Exception("Expected \$item to contain 'q' key");
185 185
                 }
186
-                if (! isset($item['u'])) {
186
+                if ( ! isset($item['u'])) {
187 187
                     throw new Exception("Expected \$item to contain 'u' key");
188 188
                 }
189 189
                 break;
190 190
 
191 191
             case self::COMMAND_DELETE:
192
-                if (! isset($item['q'])) {
192
+                if ( ! isset($item['q'])) {
193 193
                     throw new Exception("Expected \$item to contain 'q' key");
194 194
                 }
195
-                if (! isset($item['limit'])) {
195
+                if ( ! isset($item['limit'])) {
196 196
                     throw new Exception("Expected \$item to contain 'limit' key");
197 197
                 }
198 198
                 break;
Please login to merge, or discard this patch.