Merge pull request #415

Author: jmikola

tests/readPreference/bug0146-001.phpt

@@ -63,10 +63,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   ["readPreference"]=>
   object(MongoDB\Driver\ReadPreference)#%d (%d) {
     ["mode"]=>
-    int(1)
-    ["tags"]=>
-    array(0) {
-    }
+    string(7) "primary"
   }
   ["isDead"]=>
   bool(true)
@@ -112,10 +109,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   ["readPreference"]=>
   object(MongoDB\Driver\ReadPreference)#%d (%d) {
     ["mode"]=>
-    int(5)
-    ["tags"]=>
-    array(0) {
-    }
+    string(16) "primaryPreferred"
   }
   ["isDead"]=>
   bool(true)
@@ -161,10 +155,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   ["readPreference"]=>
   object(MongoDB\Driver\ReadPreference)#%d (%d) {
     ["mode"]=>
-    int(2)
-    ["tags"]=>
-    array(0) {
-    }
+    string(9) "secondary"
   }
   ["isDead"]=>
   bool(true)
@@ -210,10 +201,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   ["readPreference"]=>
   object(MongoDB\Driver\ReadPreference)#%d (%d) {
     ["mode"]=>
-    int(6)
-    ["tags"]=>
-    array(0) {
-    }
+    string(18) "secondaryPreferred"
   }
   ["isDead"]=>
   bool(true)
@@ -259,10 +247,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   ["readPreference"]=>
   object(MongoDB\Driver\ReadPreference)#%d (%d) {
     ["mode"]=>
-    int(10)
-    ["tags"]=>
-    array(0) {
-    }
+    string(7) "nearest"
   }
   ["isDead"]=>
   bool(true)

tests/replicaset/writeresult-getserver-002.phpt

@@ -79,15 +79,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   ["writeConcernError"]=>
   NULL
   ["writeConcern"]=>
-  array(%d) {
-    ["w"]=>
-    NULL
-    ["wmajority"]=>
-    bool(false)
-    ["wtimeout"]=>
-    int(0)
-    ["journal"]=>
-    NULL
+  array(0) {
   }
 }
 string(14) "192.168.112.10"

tests/writeResult/writeresult-debug-002.phpt

@@ -100,15 +100,9 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
     string(29) "Not enough data-bearing nodes"
   }
   ["writeConcern"]=>
-  array(4) {
+  array(1) {
     ["w"]=>
     int(30)
-    ["wmajority"]=>
-    bool(false)
-    ["wtimeout"]=>
-    int(0)
-    ["journal"]=>
-    NULL
   }
 }
 ===DONE===