Merge pull request #457

src/ChangeStream.php

@@ -17,6 +17,7 @@
 
 namespace MongoDB;
 
+use MongoDB\BSON\Serializable;
 use MongoDB\Driver\Cursor;
 use MongoDB\Driver\Exception\ConnectionTimeoutException;
 use MongoDB\Driver\Exception\RuntimeException;
@@ -66,7 +67,7 @@ class ChangeStream implements Iterator
     }
 
     /**
-     * @return MongoDB\Driver\CursorId
+     * @return \MongoDB\Driver\CursorId
      */
     public function getCursorId()
     {
@@ -144,7 +145,8 @@ class ChangeStream implements Iterator
             throw new ResumeTokenException("Cannot extract a resumeToken from an empty document");
         }
         if ($document instanceof Serializable) {
-            return $this->extractResumeToken($document->bsonSerialize());
+            $this->extractResumeToken($document->bsonSerialize());
+            return;
         }
         if (isset($document->_id)) {
             $this->resumeToken = is_array($document) ? $document['_id'] : $document->_id;

src/GridFS/Bucket.php

@@ -17,6 +17,7 @@
 
 namespace MongoDB\GridFS;
 
+use MongoDB\Collection;
 use MongoDB\Driver\Cursor;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadConcern;

src/GridFS/ReadableStream.php

@@ -132,7 +132,7 @@ class ReadableStream
      *
      * Note: this method may return a string smaller than the requested length
      * if data is not available to be read.
-     * 
+     *
      * @param integer $length Number of bytes to read
      * @return string
      * @throws InvalidArgumentException if $length is negative
@@ -175,7 +175,7 @@ class ReadableStream
     public function seek($offset)
     {
         if ($offset < 0 || $offset > $this->file->length) {
-            throw new InvalidArgumentException(sprintf('$offset must be >= 0 and <= %d; given: %d', $length, $offset));
+            throw new InvalidArgumentException(sprintf('$offset must be >= 0 and <= %d; given: %d', $this->file->length, $offset));
         }
 
         /* Compute the offsets for the chunk and buffer (i.e. chunk data) from

src/GridFS/StreamWrapper.php

@@ -19,6 +19,7 @@ namespace MongoDB\GridFS;
 
 use MongoDB\BSON\UTCDateTime;
 use Exception;
+use stdClass;
 
 /**
  * Stream wrapper for reading and writing a GridFS file.
@@ -117,7 +118,7 @@ class StreamWrapper
      *
      * Note: this method may return a string smaller than the requested length
      * if data is not available to be read.
-     * 
+     *
      * @see http://php.net/manual/en/streamwrapper.stream-read.php
      * @param integer $length Number of bytes to read
      * @return string

src/GridFS/WritableStream.php

@@ -22,6 +22,7 @@ use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Exception\InvalidArgumentException;
+use stdClass;
 
 /**
  * WritableStream abstracts the process of writing a GridFS file.
@@ -48,7 +49,7 @@ class WritableStream
      *
      *  * _id (mixed): File document identifier. Defaults to a new ObjectId.
      *
-     *  * aliases (array of strings): DEPRECATED An array of aliases. 
+     *  * aliases (array of strings): DEPRECATED An array of aliases.
      *    Applications wishing to store aliases should add an aliases field to
      *    the metadata document instead.
      *

src/MapReduceResult.php

@@ -19,6 +19,7 @@ namespace MongoDB;
 
 use IteratorAggregate;
 use stdClass;
+use Traversable;
 
 /**
  * Result class for mapReduce command results.

src/Operation/BulkWrite.php

@@ -243,7 +243,7 @@ class BulkWrite implements Executable
                         $this->isArrayFiltersUsed = true;
 
                         if ( ! is_array($args[2]['arrayFilters'])) {
-                            throw InvalidArgumentException::InvalidType(sprintf('$operations[%d]["%s"][2]["arrayFilters"]', $i, $type), $args[2]['arrayFilters'], 'array');
+                            throw InvalidArgumentException::invalidType(sprintf('$operations[%d]["%s"][2]["arrayFilters"]', $i, $type), $args[2]['arrayFilters'], 'array');
                         }
                     }
 

src/Operation/ChangeStream.php

@@ -18,6 +18,7 @@
 namespace MongoDB\Operation;
 
 use MongoDB\ChangeStream as ChangeStreamResult;
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;