Commit af6f6788 authored by Jeremy Mikola's avatar Jeremy Mikola

Merge pull request #288

parents 818e4506 dacec1af
...@@ -13,15 +13,15 @@ env: ...@@ -13,15 +13,15 @@ env:
- MONGO_REPO_TYPE="precise/mongodb-enterprise/" - MONGO_REPO_TYPE="precise/mongodb-enterprise/"
- SOURCES_LOC="/etc/apt/sources.list.d/mongodb.list" - SOURCES_LOC="/etc/apt/sources.list.d/mongodb.list"
matrix: matrix:
- DRIVER_VERSION=1.2.0alpha3 SERVER_VERSION=2.6 - DRIVER_VERSION=1.2.0 SERVER_VERSION=2.6
- DRIVER_VERSION=1.2.0alpha3 SERVER_VERSION=3.0 - DRIVER_VERSION=1.2.0 SERVER_VERSION=3.0
- DRIVER_VERSION=1.2.0alpha3 SERVER_VERSION=3.2 - DRIVER_VERSION=1.2.0 SERVER_VERSION=3.2
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- php: 7.0 - php: 7.0
env: DRIVER_VERSION=1.2.0alpha3 SERVER_VERSION=2.4 env: DRIVER_VERSION=1.2.0 SERVER_VERSION=2.4
- php: 7.0 - php: 7.0
env: DRIVER_VERSION=devel SERVER_VERSION=3.2 env: DRIVER_VERSION=devel SERVER_VERSION=3.2
exclude: exclude:
......
...@@ -25,6 +25,7 @@ class Client ...@@ -25,6 +25,7 @@ class Client
private $manager; private $manager;
private $uri; private $uri;
private $typeMap; private $typeMap;
private $writeConcern;
/** /**
* Constructs a new Client instance. * Constructs a new Client instance.
...@@ -63,6 +64,7 @@ class Client ...@@ -63,6 +64,7 @@ class Client
unset($driverOptions['typeMap']); unset($driverOptions['typeMap']);
$this->manager = new Manager($uri, $uriOptions, $driverOptions); $this->manager = new Manager($uri, $uriOptions, $driverOptions);
$this->writeConcern = $this->manager->getWriteConcern();
} }
/** /**
...@@ -77,6 +79,7 @@ class Client ...@@ -77,6 +79,7 @@ class Client
'manager' => $this->manager, 'manager' => $this->manager,
'uri' => $this->uri, 'uri' => $this->uri,
'typeMap' => $this->typeMap, 'typeMap' => $this->typeMap,
'writeConcern' => $this->writeConcern,
]; ];
} }
......
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