Merged pull request #670

Author: derickr

tests/command/command-ctor-001.phpt

@@ -51,8 +51,9 @@ $cursor = $manager->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command([
     'pipeline' => [
         ['$match' => $document],
     ],
+    'cursor' => new stdClass(),
 ]));
-var_dump($cursor->toArray()[0]->result[0]);
+var_dump($cursor->toArray()[0]);
 
 ?>
 ===DONE===

tests/cursor/cursor-tailable_error-002.phpt

@@ -84,5 +84,5 @@ Awaiting results...
 Awaiting results...
 Awaiting results...
 OK: Got MongoDB\Driver\Exception\RuntimeException
-Cursor not found, cursor id: %d
+%r(Cursor not found, cursor id: \d+|cursor id \d+ not found)%r
 ===DONE===

tests/manager/manager-var-dump-001.phpt

@@ -52,23 +52,6 @@ object(MongoDB\Driver\Manager)#%d (%d) {
       bool(false)
       ["last_is_master"]=>
       array(%d) {
-        ["ismaster"]=>
-        bool(true)
-        ["maxBsonObjectSize"]=>
-        int(16777216)
-        ["maxMessageSizeBytes"]=>
-        int(48000000)
-        ["maxWriteBatchSize"]=>
-        int(1000)
-        ["localTime"]=>
-        object(%s\UTCDateTime)#%d (%d) {
-          ["milliseconds"]=>
-          %r(int\(\d+\)|string\(\d+\) "\d+")%r
-        }
-        ["maxWireVersion"]=>
-        int(%d)
-        ["minWireVersion"]=>
-        int(0)
         %a
       }
       ["round_trip_time"]=>

tests/server/server-debug.phpt

@@ -35,25 +35,7 @@ object(MongoDB\Driver\Server)#%d (%d) {
   bool(false)
   ["last_is_master"]=>
   array(%d) {
-    ["ismaster"]=>
-    bool(true)
-    ["maxBsonObjectSize"]=>
-    int(16777216)
-    ["maxMessageSizeBytes"]=>
-    int(48000000)
-    ["maxWriteBatchSize"]=>
-    int(1000)
-    ["localTime"]=>
-    object(%s\UTCDateTime)#%d (%d) {
-      ["milliseconds"]=>
-      %r(int\(\d+\)|string\(\d+\) "\d+")%r
-    }
-    ["maxWireVersion"]=>
-    int(%d)
-    ["minWireVersion"]=>
-    int(0)
     %a
-    float(1)
   }
   ["round_trip_time"]=>
   int(%d)

tests/server/server-getInfo-001.phpt

@@ -17,24 +17,6 @@ var_dump($manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver
 <?php exit(0); ?>
 --EXPECTF--
 array(%d) {
-  ["ismaster"]=>
-  bool(true)
-  ["maxBsonObjectSize"]=>
-  int(16777216)
-  ["maxMessageSizeBytes"]=>
-  int(48000000)
-  ["maxWriteBatchSize"]=>
-  int(1000)
-  ["localTime"]=>
-  object(%s\UTCDateTime)#%d (%d) {
-    ["milliseconds"]=>
-    %r(int\(\d+\)|string\(\d+\) "\d+")%r
-  }
-  ["maxWireVersion"]=>
-  int(%d)
-  ["minWireVersion"]=>
-  int(0)
   %a
-  float(1)
 }
 ===DONE===