Commit 4b84bd96 authored by Jeremy Mikola's avatar Jeremy Mikola

PHPLIB-73: Database and Collection should inherit Manager's WC and RP

parent ced71457
...@@ -14,8 +14,6 @@ use MongoDB\Operation\ListDatabases; ...@@ -14,8 +14,6 @@ use MongoDB\Operation\ListDatabases;
class Client class Client
{ {
private $manager; private $manager;
private $readPreference;
private $writeConcern;
/** /**
* Constructs a new Client instance. * Constructs a new Client instance.
...@@ -77,9 +75,8 @@ class Client ...@@ -77,9 +75,8 @@ class Client
public function selectCollection($databaseName, $collectionName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null) public function selectCollection($databaseName, $collectionName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
{ {
$namespace = $databaseName . '.' . $collectionName; $namespace = $databaseName . '.' . $collectionName;
// TODO: inherit from Manager options once PHPC-196 is implemented $writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
$writeConcern = $writeConcern ?: $this->writeConcern; $readPreference = $readPreference ?: $this->manager->getReadPreference();
$readPreference = $readPreference ?: $this->readPreference;
return new Collection($this->manager, $namespace, $writeConcern, $readPreference); return new Collection($this->manager, $namespace, $writeConcern, $readPreference);
} }
...@@ -97,9 +94,8 @@ class Client ...@@ -97,9 +94,8 @@ class Client
*/ */
public function selectDatabase($databaseName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null) public function selectDatabase($databaseName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
{ {
// TODO: inherit from Manager options once PHPC-196 is implemented $writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
$writeConcern = $writeConcern ?: $this->writeConcern; $readPreference = $readPreference ?: $this->manager->getReadPreference();
$readPreference = $readPreference ?: $this->readPreference;
return new Database($this->manager, $databaseName, $writeConcern, $readPreference); return new Database($this->manager, $databaseName, $writeConcern, $readPreference);
} }
......
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