From 3197692874dc89c25847980fe9b0df51e839a472 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 20 Jun 2016 16:54:47 -0400 Subject: [PATCH 1/3] Remove unnecessary use statements --- src/Collection.php | 2 -- src/Database.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/Collection.php b/src/Collection.php index 75e2bed09..56c4e1669 100644 --- a/src/Collection.php +++ b/src/Collection.php @@ -7,11 +7,9 @@ use MongoDB\Driver\Manager; use MongoDB\Driver\ReadConcern; use MongoDB\Driver\ReadPreference; -use MongoDB\Driver\Server; use MongoDB\Driver\WriteConcern; use MongoDB\Exception\InvalidArgumentException; use MongoDB\Model\IndexInfoIterator; -use MongoDB\Model\IndexInput; use MongoDB\Operation\Aggregate; use MongoDB\Operation\BulkWrite; use MongoDB\Operation\CreateIndexes; diff --git a/src/Database.php b/src/Database.php index ee2d75052..b26ef3694 100644 --- a/src/Database.php +++ b/src/Database.php @@ -5,10 +5,8 @@ use MongoDB\Collection; use MongoDB\Driver\Cursor; use MongoDB\Driver\Manager; -use MongoDB\Driver\Query; use MongoDB\Driver\ReadConcern; use MongoDB\Driver\ReadPreference; -use MongoDB\Driver\Server; use MongoDB\Driver\WriteConcern; use MongoDB\Exception\InvalidArgumentException; use MongoDB\Model\CollectionInfoIterator; From b3286bd6d87a24e4983b81a3f9964101b5c4be34 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 20 Jun 2016 16:55:12 -0400 Subject: [PATCH 2/3] Fix doc block spacing --- src/Model/CollectionInfo.php | 8 ++++---- src/Model/DatabaseInfo.php | 8 ++++---- src/Model/IndexInfo.php | 8 ++++---- src/Model/IndexInput.php | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Model/CollectionInfo.php b/src/Model/CollectionInfo.php index dee27515f..edc7873dd 100644 --- a/src/Model/CollectionInfo.php +++ b/src/Model/CollectionInfo.php @@ -18,10 +18,10 @@ class CollectionInfo private $info; /** - * Constructor. - * - * @param array $info Collection info - */ + * Constructor. + * + * @param array $info Collection info + */ public function __construct(array $info) { $this->info = $info; diff --git a/src/Model/DatabaseInfo.php b/src/Model/DatabaseInfo.php index 61d26194a..c63923cd1 100644 --- a/src/Model/DatabaseInfo.php +++ b/src/Model/DatabaseInfo.php @@ -17,10 +17,10 @@ class DatabaseInfo private $info; /** - * Constructor. - * - * @param array $info Database info - */ + * Constructor. + * + * @param array $info Database info + */ public function __construct(array $info) { $this->info = $info; diff --git a/src/Model/IndexInfo.php b/src/Model/IndexInfo.php index c1b948071..2869bf59e 100644 --- a/src/Model/IndexInfo.php +++ b/src/Model/IndexInfo.php @@ -25,10 +25,10 @@ class IndexInfo implements ArrayAccess private $info; /** - * Constructor. - * - * @param array $info Index info - */ + * Constructor. + * + * @param array $info Index info + */ public function __construct(array $info) { $this->info = $info; diff --git a/src/Model/IndexInput.php b/src/Model/IndexInput.php index c74bfc46f..0fe4fdde5 100644 --- a/src/Model/IndexInput.php +++ b/src/Model/IndexInput.php @@ -20,11 +20,11 @@ class IndexInput implements Serializable private $index; /** - * Constructor. - * - * @param array $index Index specification - * @throws InvalidArgumentException - */ + * Constructor. + * + * @param array $index Index specification + * @throws InvalidArgumentException + */ public function __construct(array $index) { if ( ! isset($index['key'])) { From 3b6ad58dc2b66523be0f57234638a58203cabd2b Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 20 Jun 2016 16:55:27 -0400 Subject: [PATCH 3/3] Fix DatabaseCommand::execute() return type hint --- src/Operation/DatabaseCommand.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Operation/DatabaseCommand.php b/src/Operation/DatabaseCommand.php index b55c78a44..264e691f8 100644 --- a/src/Operation/DatabaseCommand.php +++ b/src/Operation/DatabaseCommand.php @@ -3,6 +3,7 @@ namespace MongoDB\Operation; use MongoDB\Driver\Command; +use MongoDB\Driver\Cursor; use MongoDB\Driver\ReadPreference; use MongoDB\Driver\Server; use MongoDB\Exception\InvalidArgumentException; @@ -62,7 +63,7 @@ public function __construct($databaseName, $command, array $options = []) * * @see Executable::execute() * @param Server $server - * @return integer + * @return Cursor */ public function execute(Server $server) {