Merge pull request doctrine#177 from doctrine/1.0-conn-ctor

jmikola · jmikola · commit 7874c712728b · 2014-04-21T16:21:38.000-04:00
Respect $options when $server is null in Connection constructor
diff --git a/lib/Doctrine/MongoDB/Connection.php b/lib/Doctrine/MongoDB/Connection.php
@@ -76,7 +76,7 @@ public function __construct($server = null, array $options = array(), Configurat
     {
         if ($server instanceof \MongoClient || $server instanceof \Mongo) {
             $this->mongo = $server;
-        } elseif ($server !== null) {
+        } else {
             $this->server = $server;
             $this->options = $options;
         }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function __construct($server = null, array $options = array(), Configurat`
`76`	`76`	`{`
`77`	`77`	`if ($server instanceof \MongoClient \|\| $server instanceof \Mongo) {`
`78`	`78`	`$this->mongo = $server;`
`79`		`- } elseif ($server !== null) {`
	`79`	`+ } else {`
`80`	`80`	`$this->server = $server;`
`81`	`81`	`$this->options = $options;`
`82`	`82`	`}`