Completed
Pull Request — master (#261)
by Andreas
05:54
created
lib/Mongo/MongoCommandCursor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
             }
66 66
 
67 67
             $originalReadPreference = null;
68
-            if (!$this->supportsReadPreference()) {
68
+            if ( ! $this->supportsReadPreference()) {
69 69
                 $originalReadPreference = $this->readPreference;
70 70
                 $this->setReadPreference(\MongoClient::RP_PRIMARY);
71 71
             }
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/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.
lib/Mongo/MongoCollection.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function aggregate(array $pipeline, array $op = [])
133 133
     {
134
-        if (! TypeConverter::isNumericArray($pipeline)) {
134
+        if ( ! TypeConverter::isNumericArray($pipeline)) {
135 135
             $operators = func_get_args();
136 136
             $pipeline = [];
137 137
             $options = [];
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
             $i = 0;
140 140
             foreach ($operators as $operator) {
141 141
                 $i++;
142
-                if (! is_array($operator)) {
142
+                if ( ! is_array($operator)) {
143 143
                     trigger_error("Argument $i is not an array", E_USER_WARNING);
144 144
                     return;
145 145
                 }
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
         ];
193 193
 
194 194
         // Convert cursor option
195
-        if (! isset($options['cursor'])) {
195
+        if ( ! isset($options['cursor'])) {
196 196
             $options['cursor'] = new \stdClass();
197 197
         }
198 198
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
             throw ExceptionConverter::toLegacy($e);
295 295
         }
296 296
 
297
-        if (! $result->isAcknowledged()) {
297
+        if ( ! $result->isAcknowledged()) {
298 298
             return true;
299 299
         }
300 300
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 
326 326
         foreach ($a as $key => $item) {
327 327
             try {
328
-                if (! $this->ensureDocumentHasMongoId($a[$key])) {
328
+                if ( ! $this->ensureDocumentHasMongoId($a[$key])) {
329 329
                     if ($continueOnError) {
330 330
                         unset($a[$key]);
331 331
                     } else {
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
                     }
335 335
                 }
336 336
             } catch (MongoException $e) {
337
-                if (! $continueOnError) {
337
+                if ( ! $continueOnError) {
338 338
                     throw $e;
339 339
                 }
340 340
             }
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
             throw ExceptionConverter::toLegacy($e, 'MongoResultException');
350 350
         }
351 351
 
352
-        if (! $result->isAcknowledged()) {
352
+        if ( ! $result->isAcknowledged()) {
353 353
             return true;
354 354
         }
355 355
 
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
             throw ExceptionConverter::toLegacy($e);
404 404
         }
405 405
 
406
-        if (! $result->isAcknowledged()) {
406
+        if ( ! $result->isAcknowledged()) {
407 407
             return true;
408 408
         }
409 409
 
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
      */
431 431
     public function remove(array $criteria = [], array $options = [])
432 432
     {
433
-        $multiple = isset($options['justOne']) ? !$options['justOne'] : true;
433
+        $multiple = isset($options['justOne']) ? ! $options['justOne'] : true;
434 434
         $method = $multiple ? 'deleteMany' : 'deleteOne';
435 435
 
436 436
         try {
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
             throw ExceptionConverter::toLegacy($e);
444 444
         }
445 445
 
446
-        if (! $result->isAcknowledged()) {
446
+        if ( ! $result->isAcknowledged()) {
447 447
             return true;
448 448
         }
449 449
 
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
 
522 522
                 $options['projection'] = TypeConverter::convertProjection($fields);
523 523
 
524
-                if (! \MongoDB\is_first_key_operator($update)) {
524
+                if ( ! \MongoDB\is_first_key_operator($update)) {
525 525
                     $document = $this->collection->findOneAndReplace($query, $update, $options);
526 526
                 } else {
527 527
                     $document = $this->collection->findOneAndUpdate($query, $update, $options);
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
     public function findOne($query = [], array $fields = [], array $options = [])
553 553
     {
554 554
         // Can't typehint for array since MongoGridFS extends and accepts strings
555
-        if (! is_array($query)) {
555
+        if ( ! is_array($query)) {
556 556
             trigger_error(sprintf('MongoCollection::findOne(): expects parameter 1 to be an array or object, %s given', gettype($query)), E_USER_WARNING);
557 557
             return;
558 558
         }
@@ -592,11 +592,11 @@  discard block
 block discarded – undo
592 592
             $keys = (array) $keys;
593 593
         }
594 594
 
595
-        if (! is_array($keys) || ! count($keys)) {
595
+        if ( ! is_array($keys) || ! count($keys)) {
596 596
             throw new MongoException('index specification has no elements');
597 597
         }
598 598
 
599
-        if (! isset($options['name'])) {
599
+        if ( ! isset($options['name'])) {
600 600
             $options['name'] = \MongoDB\generate_index_name($keys);
601 601
         }
602 602
 
@@ -627,20 +627,20 @@  discard block
 block discarded – undo
627 627
 
628 628
             $this->collection->createIndex($keys, $options);
629 629
         } catch (\MongoDB\Driver\Exception\Exception $e) {
630
-            if (! $e instanceof CommandException || strpos($e->getMessage(), 'with a different name') === false) {
630
+            if ( ! $e instanceof CommandException || strpos($e->getMessage(), 'with a different name') === false) {
631 631
                 throw ExceptionConverter::toLegacy($e, 'MongoResultException');
632 632
             }
633 633
         }
634 634
 
635 635
         $result = [
636
-            'createdCollectionAutomatically' => !$collectionExists,
636
+            'createdCollectionAutomatically' => ! $collectionExists,
637 637
             'numIndexesBefore' => $indexCount,
638 638
             'numIndexesAfter' => $indexCount,
639 639
             'note' => 'all indexes already exist',
640 640
             'ok' => 1.0,
641 641
         ];
642 642
 
643
-        if (! $indexExists) {
643
+        if ( ! $indexExists) {
644 644
             $result['numIndexesAfter']++;
645 645
             unset($result['note']);
646 646
         }
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
     {
674 674
         if (is_string($keys)) {
675 675
             $indexName = $keys;
676
-            if (! preg_match('#_-?1$#', $indexName)) {
676
+            if ( ! preg_match('#_-?1$#', $indexName)) {
677 677
                 $indexName .= '_1';
678 678
             }
679 679
         } elseif (is_array($keys)) {
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
      */
713 713
     public function getIndexInfo()
714 714
     {
715
-        $convertIndex = function (\MongoDB\Model\IndexInfo $indexInfo) {
715
+        $convertIndex = function(\MongoDB\Model\IndexInfo $indexInfo) {
716 716
             $infos = [
717 717
                 'v' => $indexInfo->getVersion(),
718 718
                 'key' => $indexInfo->getKey(),
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
736 736
             ];
737 737
 
738 738
             foreach ($additionalKeys as $key) {
739
-                if (! isset($indexInfo[$key])) {
739
+                if ( ! isset($indexInfo[$key])) {
740 740
                     continue;
741 741
                 }
742 742
 
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
     {
762 762
         try {
763 763
             // Handle legacy mode - limit and skip as second and third parameters, respectively
764
-            if (! is_array($options)) {
764
+            if ( ! is_array($options)) {
765 765
                 $limit = $options;
766 766
                 $options = [];
767 767
 
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
                 $this->convertWriteConcernOptions($options)
809 809
             );
810 810
 
811
-            if (! $result->isAcknowledged()) {
811
+            if ( ! $result->isAcknowledged()) {
812 812
                 return true;
813 813
             }
814 814
 
@@ -842,13 +842,13 @@  discard block
 block discarded – undo
842 842
         if ($document_or_id instanceof \MongoId) {
843 843
             $id = $document_or_id;
844 844
         } elseif (is_object($document_or_id)) {
845
-            if (! isset($document_or_id->_id)) {
845
+            if ( ! isset($document_or_id->_id)) {
846 846
                 return null;
847 847
             }
848 848
 
849 849
             $id = $document_or_id->_id;
850 850
         } elseif (is_array($document_or_id)) {
851
-            if (! isset($document_or_id['_id'])) {
851
+            if ( ! isset($document_or_id['_id'])) {
852 852
                 return null;
853 853
             }
854 854
 
@@ -961,11 +961,11 @@  discard block
 block discarded – undo
961 961
             $options['w'] = ($options['safe']) ? 1 : 0;
962 962
         }
963 963
 
964
-        if (isset($options['wtimeout']) && !isset($options['wTimeoutMS'])) {
964
+        if (isset($options['wtimeout']) && ! isset($options['wTimeoutMS'])) {
965 965
             $options['wTimeoutMS'] = $options['wtimeout'];
966 966
         }
967 967
 
968
-        if (isset($options['w']) || !isset($options['wTimeoutMS'])) {
968
+        if (isset($options['w']) || ! isset($options['wTimeoutMS'])) {
969 969
             $collectionWriteConcern = $this->getWriteConcern();
970 970
             $writeConcern = $this->createWriteConcernFromParameters(
971 971
                 isset($options['w']) ? $options['w'] : $collectionWriteConcern['w'],
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
     private function ensureDocumentHasMongoId(&$document)
1004 1004
     {
1005 1005
         if (is_array($document) || $document instanceof ArrayObject) {
1006
-            if (! isset($document['_id'])) {
1006
+            if ( ! isset($document['_id'])) {
1007 1007
                 $document['_id'] = new \MongoId();
1008 1008
             }
1009 1009
 
@@ -1013,12 +1013,12 @@  discard block
 block discarded – undo
1013 1013
         } elseif (is_object($document)) {
1014 1014
             $reflectionObject = new \ReflectionObject($document);
1015 1015
             foreach ($reflectionObject->getProperties() as $property) {
1016
-                if (! $property->isPublic()) {
1016
+                if ( ! $property->isPublic()) {
1017 1017
                     throw new \MongoException('zero-length keys are not allowed, did you use $ with double quotes?');
1018 1018
                 }
1019 1019
             }
1020 1020
 
1021
-            if (! isset($document->_id)) {
1021
+            if ( ! isset($document->_id)) {
1022 1022
                 $document->_id = new \MongoId();
1023 1023
             }
1024 1024
 
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
 
1050 1050
     private function mustBeArrayOrObject($a)
1051 1051
     {
1052
-        if (!is_array($a) && !is_object($a)) {
1052
+        if ( ! is_array($a) && ! is_object($a)) {
1053 1053
             throw new \MongoException('document must be an array or object');
1054 1054
         }
1055 1055
     }
Please login to merge, or discard this patch.