Merge branch 'master' of https://github.com/top-think/think-mongo

top-think · Jun 3, 2018 · 657cc79 · 657cc79
2 parents 592941b + 74b3ca5
commit 657cc79
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -462,7 +462,7 @@ public function aggregate($options, $extra)
             'aggregate'    => $options['table'],
             'allowDiskUse' => true,
             'pipeline'     => $pipeline,
-            'cursor'       => \stdClass,
+            'cursor'       => new \stdClass,
         ];
 
         foreach (['explain', 'collation', 'bypassDocumentValidation', 'readConcern'] as $option) {

diff --git a/src/Connection.php b/src/Connection.php
@@ -12,7 +12,6 @@
 use MongoDB\BSON\ObjectID;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
-use MongoDB\Driver\Cursor;
 use MongoDB\Driver\Exception\AuthenticationException;
 use MongoDB\Driver\Exception\BulkWriteException;
 use MongoDB\Driver\Exception\ConnectionException;
@@ -22,7 +21,6 @@
 use MongoDB\Driver\Query as MongoQuery;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
-use think\Collection;
 use think\Db;
 use think\Debug;
 use think\Exception;