Merge branch 'v1.0'

jmikola · jmikola · commit 5fe4588f87fe · 2016-09-22T19:34:07.000-04:00
diff --git a/src/Client.php b/src/Client.php
@@ -50,9 +50,12 @@ public function __construct($uri = 'mongodb://localhost:27017', array $uriOption
             throw InvalidArgumentException::invalidType('"typeMap" driver option', $driverOptions['typeMap'], 'array');
         }
 
-        $this->manager = new Manager($uri, $uriOptions, $driverOptions);
         $this->uri = (string) $uri;
         $this->typeMap = isset($driverOptions['typeMap']) ? $driverOptions['typeMap'] : null;
+
+        unset($driverOptions['typeMap']);
+
+        $this->manager = new Manager($uri, $uriOptions, $driverOptions);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,12 @@ public function __construct($uri = 'mongodb://localhost:27017', array $uriOption`
`50`	`50`	`throw InvalidArgumentException::invalidType('"typeMap" driver option', $driverOptions['typeMap'], 'array');`
`51`	`51`	`}`
`52`	`52`
`53`		`- $this->manager = new Manager($uri, $uriOptions, $driverOptions);`
`54`	`53`	`$this->uri = (string) $uri;`
`55`	`54`	`$this->typeMap = isset($driverOptions['typeMap']) ? $driverOptions['typeMap'] : null;`
	`55`	`+`
	`56`	`+ unset($driverOptions['typeMap']);`
	`57`	`+`
	`58`	`+ $this->manager = new Manager($uri, $uriOptions, $driverOptions);`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`/**`