Commit dc6d831a authored by Jeremy Mikola's avatar Jeremy Mikola

Merge branch 'v1.0'

parents cc137d46 cb72ccc1
...@@ -7,11 +7,9 @@ use MongoDB\Driver\Cursor; ...@@ -7,11 +7,9 @@ use MongoDB\Driver\Cursor;
use MongoDB\Driver\Manager; use MongoDB\Driver\Manager;
use MongoDB\Driver\ReadConcern; use MongoDB\Driver\ReadConcern;
use MongoDB\Driver\ReadPreference; use MongoDB\Driver\ReadPreference;
use MongoDB\Driver\Server;
use MongoDB\Driver\WriteConcern; use MongoDB\Driver\WriteConcern;
use MongoDB\Exception\InvalidArgumentException; use MongoDB\Exception\InvalidArgumentException;
use MongoDB\Model\IndexInfoIterator; use MongoDB\Model\IndexInfoIterator;
use MongoDB\Model\IndexInput;
use MongoDB\Operation\Aggregate; use MongoDB\Operation\Aggregate;
use MongoDB\Operation\BulkWrite; use MongoDB\Operation\BulkWrite;
use MongoDB\Operation\CreateIndexes; use MongoDB\Operation\CreateIndexes;
......
...@@ -5,10 +5,8 @@ namespace MongoDB; ...@@ -5,10 +5,8 @@ namespace MongoDB;
use MongoDB\Collection; use MongoDB\Collection;
use MongoDB\Driver\Cursor; use MongoDB\Driver\Cursor;
use MongoDB\Driver\Manager; use MongoDB\Driver\Manager;
use MongoDB\Driver\Query;
use MongoDB\Driver\ReadConcern; use MongoDB\Driver\ReadConcern;
use MongoDB\Driver\ReadPreference; use MongoDB\Driver\ReadPreference;
use MongoDB\Driver\Server;
use MongoDB\Driver\WriteConcern; use MongoDB\Driver\WriteConcern;
use MongoDB\Exception\InvalidArgumentException; use MongoDB\Exception\InvalidArgumentException;
use MongoDB\Model\CollectionInfoIterator; use MongoDB\Model\CollectionInfoIterator;
......
...@@ -18,10 +18,10 @@ class CollectionInfo ...@@ -18,10 +18,10 @@ class CollectionInfo
private $info; private $info;
/** /**
* Constructor. * Constructor.
* *
* @param array $info Collection info * @param array $info Collection info
*/ */
public function __construct(array $info) public function __construct(array $info)
{ {
$this->info = $info; $this->info = $info;
......
...@@ -17,10 +17,10 @@ class DatabaseInfo ...@@ -17,10 +17,10 @@ class DatabaseInfo
private $info; private $info;
/** /**
* Constructor. * Constructor.
* *
* @param array $info Database info * @param array $info Database info
*/ */
public function __construct(array $info) public function __construct(array $info)
{ {
$this->info = $info; $this->info = $info;
......
...@@ -25,10 +25,10 @@ class IndexInfo implements ArrayAccess ...@@ -25,10 +25,10 @@ class IndexInfo implements ArrayAccess
private $info; private $info;
/** /**
* Constructor. * Constructor.
* *
* @param array $info Index info * @param array $info Index info
*/ */
public function __construct(array $info) public function __construct(array $info)
{ {
$this->info = $info; $this->info = $info;
......
...@@ -20,11 +20,11 @@ class IndexInput implements Serializable ...@@ -20,11 +20,11 @@ class IndexInput implements Serializable
private $index; private $index;
/** /**
* Constructor. * Constructor.
* *
* @param array $index Index specification * @param array $index Index specification
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
public function __construct(array $index) public function __construct(array $index)
{ {
if ( ! isset($index['key'])) { if ( ! isset($index['key'])) {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace MongoDB\Operation; namespace MongoDB\Operation;
use MongoDB\Driver\Command; use MongoDB\Driver\Command;
use MongoDB\Driver\Cursor;
use MongoDB\Driver\ReadPreference; use MongoDB\Driver\ReadPreference;
use MongoDB\Driver\Server; use MongoDB\Driver\Server;
use MongoDB\Exception\InvalidArgumentException; use MongoDB\Exception\InvalidArgumentException;
...@@ -62,7 +63,7 @@ class DatabaseCommand implements Executable ...@@ -62,7 +63,7 @@ class DatabaseCommand implements Executable
* *
* @see Executable::execute() * @see Executable::execute()
* @param Server $server * @param Server $server
* @return integer * @return Cursor
*/ */
public function execute(Server $server) public function execute(Server $server)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment