@@ -77,7 +77,7 @@ |
||
77 | 77 | */ |
78 | 78 | public static function get($db, $ref) |
79 | 79 | { |
80 | - if (! static::isRef($ref)) { |
|
80 | + if (!static::isRef($ref)) { |
|
81 | 81 | return null; |
82 | 82 | } |
83 | 83 |
@@ -72,7 +72,7 @@ |
||
72 | 72 | protected $readPreference = []; |
73 | 73 | |
74 | 74 | /** |
75 | - * @return Cursor |
|
75 | + * @return \Traversable |
|
76 | 76 | */ |
77 | 77 | abstract protected function ensureCursor(); |
78 | 78 |
@@ -201,7 +201,7 @@ |
||
201 | 201 | * @link http://www.php.net/manual/en/mongocursor.hasnext.php |
202 | 202 | * @throws MongoConnectionException |
203 | 203 | * @throws MongoCursorTimeoutException |
204 | - * @return bool Returns true if there is another element |
|
204 | + * @return boolean|null Returns true if there is another element |
|
205 | 205 | */ |
206 | 206 | public function hasNext() |
207 | 207 | { |
@@ -377,7 +377,7 @@ |
||
377 | 377 | */ |
378 | 378 | protected function convertCursorType() |
379 | 379 | { |
380 | - if (! $this->tailable) { |
|
380 | + if (!$this->tailable) { |
|
381 | 381 | return null; |
382 | 382 | } |
383 | 383 |
@@ -15,7 +15,6 @@ |
||
15 | 15 | |
16 | 16 | use Alcaeus\MongoDbAdapter\AbstractCursor; |
17 | 17 | use MongoDB\Driver\Cursor; |
18 | -use MongoDB\Driver\ReadPreference; |
|
19 | 18 | use MongoDB\Operation\Find; |
20 | 19 | |
21 | 20 | /** |
@@ -55,7 +55,7 @@ |
||
55 | 55 | */ |
56 | 56 | protected function setWriteConcernFromParameters($wstring, $wtimeout = 0) |
57 | 57 | { |
58 | - if (! is_string($wstring) && ! is_int($wstring)) { |
|
58 | + if (!is_string($wstring) && !is_int($wstring)) { |
|
59 | 59 | trigger_error("w for WriteConcern must be a string or integer", E_WARNING); |
60 | 60 | return false; |
61 | 61 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | * @throws MongoException if the inserted document is empty or if it contains zero-length keys. Attempting to insert an object with protected and private properties will cause a zero-length key error. |
273 | 273 | * @throws MongoCursorException if the "w" option is set and the write fails. |
274 | 274 | * @throws MongoCursorTimeoutException if the "w" option is set to a value greater than one and the operation takes longer than MongoCursor::$timeout milliseconds to complete. This does not kill the operation on the server, it is a client-side timeout. The operation in MongoCollection::$wtimeout is milliseconds. |
275 | - * @return bool|array Returns an array containing the status of the insertion if the "w" option is set. |
|
275 | + * @return MongoDB\InsertOneResult Returns an array containing the status of the insertion if the "w" option is set. |
|
276 | 276 | */ |
277 | 277 | public function insert($a, array $options = array()) |
278 | 278 | { |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | * @param array $a An array of arrays. |
286 | 286 | * @param array $options Options for the inserts. |
287 | 287 | * @throws MongoCursorException |
288 | - * @return mixed f "safe" is set, returns an associative array with the status of the inserts ("ok") and any error that may have occured ("err"). Otherwise, returns TRUE if the batch insert was successfully sent, FALSE otherwise. |
|
288 | + * @return MongoDB\InsertManyResult f "safe" is set, returns an associative array with the status of the inserts ("ok") and any error that may have occured ("err"). Otherwise, returns TRUE if the batch insert was successfully sent, FALSE otherwise. |
|
289 | 289 | */ |
290 | 290 | public function batchInsert(array $a, array $options = array()) |
291 | 291 | { |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | * @link http://www.php.net/manual/en/mongocollection.createindex.php |
467 | 467 | * @param array $keys Field or fields to use as index. |
468 | 468 | * @param array $options [optional] This parameter is an associative array of the form array("optionname" => <boolean>, ...). |
469 | - * @return array Returns the database response. |
|
469 | + * @return string|false Returns the database response. |
|
470 | 470 | */ |
471 | 471 | public function createIndex(array $keys, array $options = array()) |
472 | 472 | { |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | * @throws MongoException if the inserted document is empty or if it contains zero-length keys. Attempting to insert an object with protected and private properties will cause a zero-length key error. |
560 | 560 | * @throws MongoCursorException if the "w" option is set and the write fails. |
561 | 561 | * @throws MongoCursorTimeoutException if the "w" option is set to a value greater than one and the operation takes longer than MongoCursor::$timeout milliseconds to complete. This does not kill the operation on the server, it is a client-side timeout. The operation in MongoCollection::$wtimeout is milliseconds. |
562 | - * @return array|boolean If w was set, returns an array containing the status of the save. |
|
562 | + * @return MongoDB\UpdateResult If w was set, returns an array containing the status of the save. |
|
563 | 563 | * Otherwise, returns a boolean representing if the array was not empty (an empty array will not be inserted). |
564 | 564 | */ |
565 | 565 | public function save($a, array $options = array()) |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function aggregate(array $pipeline, array $op = []) |
123 | 123 | { |
124 | - if (! TypeConverter::isNumericArray($pipeline)) { |
|
124 | + if (!TypeConverter::isNumericArray($pipeline)) { |
|
125 | 125 | $pipeline = []; |
126 | 126 | $options = []; |
127 | 127 | |
128 | 128 | $i = 0; |
129 | 129 | foreach (func_get_args() as $operator) { |
130 | 130 | $i++; |
131 | - if (! is_array($operator)) { |
|
131 | + if (!is_array($operator)) { |
|
132 | 132 | trigger_error("Argument $i is not an array", E_WARNING); |
133 | 133 | return; |
134 | 134 | } |
@@ -164,14 +164,14 @@ discard block |
||
164 | 164 | ]; |
165 | 165 | |
166 | 166 | // Convert cursor option |
167 | - if (! isset($options['cursor']) || $options['cursor'] === true || $options['cursor'] === []) { |
|
167 | + if (!isset($options['cursor']) || $options['cursor'] === true || $options['cursor'] === []) { |
|
168 | 168 | // Cursor option needs to be an object convert bools and empty arrays since those won't be handled by TypeConverter |
169 | 169 | $options['cursor'] = new \stdClass; |
170 | 170 | } |
171 | 171 | |
172 | 172 | $command += $options; |
173 | 173 | |
174 | - $cursor = new MongoCommandCursor($this->db->getConnection(), (string)$this, $command); |
|
174 | + $cursor = new MongoCommandCursor($this->db->getConnection(), (string) $this, $command); |
|
175 | 175 | $cursor->setReadPreference($this->getReadPreference()); |
176 | 176 | |
177 | 177 | return $cursor; |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | * @throws MongoCursorException |
322 | 322 | * @return boolean |
323 | 323 | */ |
324 | - public function update(array $criteria , array $newobj, array $options = array()) |
|
324 | + public function update(array $criteria, array $newobj, array $options = array()) |
|
325 | 325 | { |
326 | 326 | $multiple = ($options['multiple']) ? $options['multiple'] : false; |
327 | 327 | // $multiple = $options['multiple'] ?? false; |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | */ |
390 | 390 | public function find(array $query = array(), array $fields = array()) |
391 | 391 | { |
392 | - $cursor = new MongoCursor($this->db->getConnection(), (string)$this, $query, $fields); |
|
392 | + $cursor = new MongoCursor($this->db->getConnection(), (string) $this, $query, $fields); |
|
393 | 393 | $cursor->setReadPreference($this->getReadPreference()); |
394 | 394 | |
395 | 395 | return $cursor; |
@@ -565,9 +565,9 @@ discard block |
||
565 | 565 | public function save($a, array $options = array()) |
566 | 566 | { |
567 | 567 | if (is_object($a)) { |
568 | - $a = (array)$a; |
|
568 | + $a = (array) $a; |
|
569 | 569 | } |
570 | - if ( ! array_key_exists('_id', $a)) { |
|
570 | + if (!array_key_exists('_id', $a)) { |
|
571 | 571 | $id = new \MongoId(); |
572 | 572 | } else { |
573 | 573 | $id = $a['_id']; |
@@ -629,20 +629,20 @@ discard block |
||
629 | 629 | if (is_string($reduce)) { |
630 | 630 | $reduce = new MongoCode($reduce); |
631 | 631 | } |
632 | - if ( ! $reduce instanceof MongoCode) { |
|
632 | + if (!$reduce instanceof MongoCode) { |
|
633 | 633 | throw new \InvalidArgumentExcption('reduce parameter should be a string or MongoCode instance.'); |
634 | 634 | } |
635 | 635 | $command = [ |
636 | 636 | 'group' => [ |
637 | 637 | 'ns' => $this->name, |
638 | - '$reduce' => (string)$reduce, |
|
638 | + '$reduce' => (string) $reduce, |
|
639 | 639 | 'initial' => $initial, |
640 | 640 | 'cond' => $condition, |
641 | 641 | ], |
642 | 642 | ]; |
643 | 643 | |
644 | 644 | if ($keys instanceof MongoCode) { |
645 | - $command['group']['$keyf'] = (string)$keys; |
|
645 | + $command['group']['$keyf'] = (string) $keys; |
|
646 | 646 | } else { |
647 | 647 | $command['group']['key'] = $keys; |
648 | 648 | } |
@@ -651,14 +651,14 @@ discard block |
||
651 | 651 | } |
652 | 652 | if (array_key_exists('finalize', $condition)) { |
653 | 653 | if ($condition['finalize'] instanceof MongoCode) { |
654 | - $condition['finalize'] = (string)$condition['finalize']; |
|
654 | + $condition['finalize'] = (string) $condition['finalize']; |
|
655 | 655 | } |
656 | 656 | $command['group']['finalize'] = $condition['finalize']; |
657 | 657 | } |
658 | 658 | |
659 | 659 | $result = $this->db->command($command, [], $hash); |
660 | 660 | unset($result['waitedMS']); |
661 | - $result['ok'] = (int)$result['ok']; |
|
661 | + $result['ok'] = (int) $result['ok']; |
|
662 | 662 | if (count($result['retval'])) { |
663 | 663 | $result['retval'] = current($result['retval']); |
664 | 664 | } |