Completed
Pull Request — master (#28)
by Andreas
03:06
created
lib/Mongo/functions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 use Alcaeus\MongoDbAdapter\TypeConverter;
17 17
 
18
-if (! function_exists('bson_decode')) {
18
+if ( ! function_exists('bson_decode')) {
19 19
     /**
20 20
      * Deserializes a BSON object into a PHP array
21 21
      *
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     }
29 29
 }
30 30
 
31
-if (! function_exists('bson_encode')) {
31
+if ( ! function_exists('bson_encode')) {
32 32
     /**
33 33
      * Serializes a PHP variable into a BSON string
34 34
      *
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
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     public function add($item)
77 77
     {
78 78
         if (is_object($item)) {
79
-            $item = (array)$item;
79
+            $item = (array) $item;
80 80
         }
81 81
 
82 82
         $this->validate($item);
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     final public function execute(array $writeOptions = [])
96 96
     {
97 97
         $writeOptions += $this->writeOptions;
98
-        if (! count($this->items)) {
98
+        if ( ! count($this->items)) {
99 99
             return ['ok' => true];
100 100
         }
101 101
 
@@ -152,19 +152,19 @@  discard block
 block discarded – undo
152 152
     {
153 153
         switch ($this->batchType) {
154 154
             case self::COMMAND_UPDATE:
155
-                if (! isset($item['q'])) {
155
+                if ( ! isset($item['q'])) {
156 156
                     throw new Exception("Expected $item to contain 'q' key");
157 157
                 }
158
-                if (! isset($item['u'])) {
158
+                if ( ! isset($item['u'])) {
159 159
                     throw new Exception("Expected $item to contain 'u' key");
160 160
                 }
161 161
                 break;
162 162
 
163 163
             case self::COMMAND_DELETE:
164
-                if (! isset($item['q'])) {
164
+                if ( ! isset($item['q'])) {
165 165
                     throw new Exception("Expected $item to contain 'q' key");
166 166
                 }
167
-                if (! isset($item['limit'])) {
167
+                if ( ! isset($item['limit'])) {
168 168
                     throw new Exception("Expected $item to contain 'limit' key");
169 169
                 }
170 170
                 break;
Please login to merge, or discard this patch.
lib/Mongo/MongoCollection.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
      * @link http://www.php.net/manual/en/mongocollection.aggregate.php
124 124
      * @param array $pipeline
125 125
      * @param array $op
126
-     * @return array
126
+     * @return null|Traversable
127 127
      */
128 128
     public function aggregate(array $pipeline, array $op = [])
129 129
     {
@@ -923,6 +923,9 @@  discard block
 block discarded – undo
923 923
         return null;
924 924
     }
925 925
 
926
+    /**
927
+     * @param string $name
928
+     */
926 929
     private function checkCollectionName($name)
927 930
     {
928 931
         if (empty($name)) {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -126,14 +126,14 @@  discard block
 block discarded – undo
126 126
      */
127 127
     public function aggregate(array $pipeline, array $op = [])
128 128
     {
129
-        if (! TypeConverter::isNumericArray($pipeline)) {
129
+        if ( ! TypeConverter::isNumericArray($pipeline)) {
130 130
             $pipeline = [];
131 131
             $options = [];
132 132
 
133 133
             $i = 0;
134 134
             foreach (func_get_args() as $operator) {
135 135
                 $i++;
136
-                if (! is_array($operator)) {
136
+                if ( ! is_array($operator)) {
137 137
                     trigger_error("Argument $i is not an array", E_WARNING);
138 138
                     return;
139 139
                 }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         ];
181 181
 
182 182
         // Convert cursor option
183
-        if (! isset($options['cursor'])) {
183
+        if ( ! isset($options['cursor'])) {
184 184
             $options['cursor'] = new \stdClass();
185 185
         }
186 186
 
@@ -266,12 +266,12 @@  discard block
 block discarded – undo
266 266
      */
267 267
     public function insert(&$a, array $options = [])
268 268
     {
269
-        if (! $this->ensureDocumentHasMongoId($a)) {
269
+        if ( ! $this->ensureDocumentHasMongoId($a)) {
270 270
             trigger_error(sprintf('%s(): expects parameter %d to be an array or object, %s given', __METHOD__, 1, gettype($a)), E_USER_WARNING);
271 271
             return;
272 272
         }
273 273
 
274
-        if (! count((array)$a)) {
274
+        if ( ! count((array) $a)) {
275 275
             throw new \MongoException('document must be an array or object');
276 276
         }
277 277
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
             throw ExceptionConverter::toLegacy($e);
285 285
         }
286 286
 
287
-        if (! $result->isAcknowledged()) {
287
+        if ( ! $result->isAcknowledged()) {
288 288
             return true;
289 289
         }
290 290
 
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 
316 316
         foreach ($a as $key => $item) {
317 317
             try {
318
-                if (! $this->ensureDocumentHasMongoId($a[$key])) {
318
+                if ( ! $this->ensureDocumentHasMongoId($a[$key])) {
319 319
                     if ($continueOnError) {
320 320
                         unset($a[$key]);
321 321
                     } else {
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
             throw ExceptionConverter::toLegacy($e, 'MongoResultException');
340 340
         }
341 341
 
342
-        if (! $result->isAcknowledged()) {
342
+        if ( ! $result->isAcknowledged()) {
343 343
             return true;
344 344
         }
345 345
 
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
      * @throws MongoCursorException
364 364
      * @return boolean
365 365
      */
366
-    public function update(array $criteria , array $newobj, array $options = [])
366
+    public function update(array $criteria, array $newobj, array $options = [])
367 367
     {
368 368
         $multiple = isset($options['multiple']) ? $options['multiple'] : false;
369 369
         $method = $multiple ? 'updateMany' : 'updateOne';
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
             throw ExceptionConverter::toLegacy($e);
381 381
         }
382 382
 
383
-        if (! $result->isAcknowledged()) {
383
+        if ( ! $result->isAcknowledged()) {
384 384
             return true;
385 385
         }
386 386
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
      */
408 408
     public function remove(array $criteria = [], array $options = [])
409 409
     {
410
-        $multiple = isset($options['justOne']) ? !$options['justOne'] : true;
410
+        $multiple = isset($options['justOne']) ? ! $options['justOne'] : true;
411 411
         $method = $multiple ? 'deleteMany' : 'deleteOne';
412 412
 
413 413
         try {
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
             throw ExceptionConverter::toLegacy($e);
421 421
         }
422 422
 
423
-        if (! $result->isAcknowledged()) {
423
+        if ( ! $result->isAcknowledged()) {
424 424
             return true;
425 425
         }
426 426
 
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
 
493 493
                 $options['projection'] = is_array($fields) ? TypeConverter::fromLegacy($fields) : [];
494 494
 
495
-                if (! \MongoDB\is_first_key_operator($update)) {
495
+                if ( ! \MongoDB\is_first_key_operator($update)) {
496 496
                     $document = $this->collection->findOneAndReplace($query, $update, $options);
497 497
                 } else {
498 498
                     $document = $this->collection->findOneAndUpdate($query, $update, $options);
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
             $keys = (array) $keys;
560 560
         }
561 561
 
562
-        if (! is_array($keys) || ! count($keys)) {
562
+        if ( ! is_array($keys) || ! count($keys)) {
563 563
             throw new MongoException('index specification has no elements');
564 564
         }
565 565
 
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
         }
576 576
 
577 577
         foreach ($indexes as $index) {
578
-            if (! empty($options['name']) && $index->getName() === $options['name']) {
578
+            if ( ! empty($options['name']) && $index->getName() === $options['name']) {
579 579
                 throw new \MongoResultException(sprintf('index with name: %s already exists', $index->getName()));
580 580
             }
581 581
 
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
                 $this->convertWriteConcernOptions($options)
724 724
             );
725 725
 
726
-            if (! $result->isAcknowledged()) {
726
+            if ( ! $result->isAcknowledged()) {
727 727
                 return true;
728 728
             }
729 729
 
@@ -757,13 +757,13 @@  discard block
 block discarded – undo
757 757
         if ($document_or_id instanceof \MongoId) {
758 758
             $id = $document_or_id;
759 759
         } elseif (is_object($document_or_id)) {
760
-            if (! isset($document_or_id->_id)) {
760
+            if ( ! isset($document_or_id->_id)) {
761 761
                 return null;
762 762
             }
763 763
 
764 764
             $id = $document_or_id->_id;
765 765
         } elseif (is_array($document_or_id)) {
766
-            if (! isset($document_or_id['_id'])) {
766
+            if ( ! isset($document_or_id['_id'])) {
767 767
                 return null;
768 768
             }
769 769
 
@@ -806,14 +806,14 @@  discard block
 block discarded – undo
806 806
         $command = [
807 807
             'group' => [
808 808
                 'ns' => $this->name,
809
-                '$reduce' => (string)$reduce,
809
+                '$reduce' => (string) $reduce,
810 810
                 'initial' => $initial,
811 811
                 'cond' => $condition,
812 812
             ],
813 813
         ];
814 814
 
815 815
         if ($keys instanceof MongoCode) {
816
-            $command['group']['$keyf'] = (string)$keys;
816
+            $command['group']['$keyf'] = (string) $keys;
817 817
         } else {
818 818
             $command['group']['key'] = $keys;
819 819
         }
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
         }
823 823
         if (array_key_exists('finalize', $condition)) {
824 824
             if ($condition['finalize'] instanceof MongoCode) {
825
-                $condition['finalize'] = (string)$condition['finalize'];
825
+                $condition['finalize'] = (string) $condition['finalize'];
826 826
             }
827 827
             $command['group']['finalize'] = $condition['finalize'];
828 828
         }
@@ -876,11 +876,11 @@  discard block
 block discarded – undo
876 876
             $options['w'] = ($options['safe']) ? 1 : 0;
877 877
         }
878 878
 
879
-        if (isset($options['wtimeout']) && !isset($options['wTimeoutMS'])) {
879
+        if (isset($options['wtimeout']) && ! isset($options['wTimeoutMS'])) {
880 880
             $options['wTimeoutMS'] = $options['wtimeout'];
881 881
         }
882 882
 
883
-        if (isset($options['w']) || !isset($options['wTimeoutMS'])) {
883
+        if (isset($options['w']) || ! isset($options['wTimeoutMS'])) {
884 884
             $collectionWriteConcern = $this->getWriteConcern();
885 885
             $writeConcern = $this->createWriteConcernFromParameters(
886 886
                 isset($options['w']) ? $options['w'] : $collectionWriteConcern['w'],
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
         };
914 914
 
915 915
         if (is_array($document)) {
916
-            if (! isset($document['_id'])) {
916
+            if ( ! isset($document['_id'])) {
917 917
                 $document['_id'] = new \MongoId();
918 918
             }
919 919
 
@@ -923,12 +923,12 @@  discard block
 block discarded – undo
923 923
         } elseif (is_object($document)) {
924 924
             $reflectionObject = new \ReflectionObject($document);
925 925
             foreach ($reflectionObject->getProperties() as $property) {
926
-                if (! $property->isPublic()) {
926
+                if ( ! $property->isPublic()) {
927 927
                     throw new \MongoException('zero-length keys are not allowed, did you use $ with double quotes?');
928 928
                 }
929 929
             }
930 930
 
931
-            if (! isset($document->_id)) {
931
+            if ( ! isset($document->_id)) {
932 932
                 $document->_id = new \MongoId();
933 933
             }
934 934
 
Please login to merge, or discard this patch.
lib/Alcaeus/MongoDbAdapter/AbstractCursor.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
      */
119 119
     public function current()
120 120
     {
121
-        if (! $this->startedIterating) {
121
+        if ( ! $this->startedIterating) {
122 122
             return null;
123 123
         }
124 124
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
      */
138 138
     public function key()
139 139
     {
140
-        if (! $this->startedIterating) {
140
+        if ( ! $this->startedIterating) {
141 141
             return null;
142 142
         }
143 143
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
      */
154 154
     public function next()
155 155
     {
156
-        if (! $this->startedIterating) {
156
+        if ( ! $this->startedIterating) {
157 157
             $this->ensureIterator();
158 158
             $this->startedIterating = true;
159 159
         } else {
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
      */
187 187
     public function valid()
188 188
     {
189
-        if (! $this->startedIterating) {
189
+        if ( ! $this->startedIterating) {
190 190
             return false;
191 191
         }
192 192
 
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
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
         try {
204 204
             $file = $this->insertFile($record, $options);
205 205
         } catch (MongoException $e) {
206
-            throw new MongoGridFSException('Could not store file: '. $e->getMessage(), 0, $e);
206
+            throw new MongoGridFSException('Could not store file: ' . $e->getMessage(), 0, $e);
207 207
         }
208 208
 
209 209
         try {
@@ -240,10 +240,10 @@  discard block
 block discarded – undo
240 240
             ];
241 241
 
242 242
             $handle = fopen($filename, 'r');
243
-            if (! $handle) {
243
+            if ( ! $handle) {
244 244
                 throw new MongoGridFSException('could not open file: ' . $filename);
245 245
             }
246
-        } elseif (! is_resource($filename)) {
246
+        } elseif ( ! is_resource($filename)) {
247 247
             throw new \Exception('first argument must be a string or stream resource');
248 248
         } else {
249 249
             $handle = $filename;
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
 
267 267
         // Add length and MD5 if they were not present before
268 268
         $update = [];
269
-        if (! isset($record['length'])) {
269
+        if ( ! isset($record['length'])) {
270 270
             $update['length'] = $length;
271 271
         }
272
-        if (! isset($record['md5'])) {
272
+        if ( ! isset($record['md5'])) {
273 273
             try {
274 274
                 $update['md5'] = $md5;
275 275
             } catch (MongoException $e) {
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
         if (count($update)) {
281 281
             try {
282 282
                 $result = $this->update(['_id' => $file['_id']], ['$set' => $update]);
283
-                if (! $this->isOKResult($result)) {
283
+                if ( ! $this->isOKResult($result)) {
284 284
                     throw new MongoGridFSException('Could not store file');
285 285
                 }
286 286
             } catch (MongoException $e) {
@@ -304,10 +304,10 @@  discard block
 block discarded – undo
304 304
      */
305 305
     public function storeUpload($name, array $metadata = [])
306 306
     {
307
-        if (! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
307
+        if ( ! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
308 308
             throw new MongoGridFSException("Could not find uploaded file $name");
309 309
         }
310
-        if (! isset($_FILES[$name]['tmp_name'])) {
310
+        if ( ! isset($_FILES[$name]['tmp_name'])) {
311 311
             throw new MongoGridFSException("Couldn't find tmp_name in the \$_FILES array. Are you sure the upload worked?");
312 312
         }
313 313
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 
358 358
         $result = $this->chunks->insert($chunk);
359 359
 
360
-        if (! $this->isOKResult($result)) {
360
+        if ( ! $this->isOKResult($result)) {
361 361
             throw new \MongoException('error inserting chunk');
362 362
         }
363 363
 
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
         $hash = hash_init('md5');
403 403
 
404 404
         rewind($handle);
405
-        while (! feof($handle)) {
405
+        while ( ! feof($handle)) {
406 406
             $data = stream_get_contents($handle, $chunkSize);
407 407
             hash_update($hash, $data);
408 408
             $this->insertChunk($fileId, $data, $i++);
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 
433 433
         $result = $this->insert($record, $options);
434 434
 
435
-        if (! $this->isOKResult($result)) {
435
+        if ( ! $this->isOKResult($result)) {
436 436
             throw new \MongoException('error inserting file');
437 437
         }
438 438
 
Please login to merge, or discard this patch.