PHPC-157: QueryResult and CommandResult are now Result

Author: bjori

tests/functional/query-sort-003.phpt

@@ -56,7 +56,7 @@ object(MongoDB\Driver\Query)#%d (6) {
   ["batch_size"]=>
   int(0)
 }
-string(26) "MongoDB\Driver\QueryResult"
+string(26) "MongoDB\Driver\Result"
 string(21) "MongoDB\Driver\Cursor"
 abernathy.audrey
 alda.murray

tests/readPreference/002.phpt

@@ -25,7 +25,7 @@ foreach($rps as $r) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(18) {
     ["stamp"]=>
@@ -85,7 +85,7 @@ object(MongoDB\Driver\QueryResult)#%d (%d) {
   ["is_command_cursor"]=>
   bool(false)
 }
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(18) {
     ["stamp"]=>
@@ -153,7 +153,7 @@ object(MongoDB\Driver\QueryResult)#%d (%d) {
   ["is_command_cursor"]=>
   bool(false)
 }
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(18) {
     ["stamp"]=>
@@ -221,7 +221,7 @@ object(MongoDB\Driver\QueryResult)#%d (%d) {
   ["is_command_cursor"]=>
   bool(false)
 }
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(18) {
     ["stamp"]=>
@@ -289,7 +289,7 @@ object(MongoDB\Driver\QueryResult)#%d (%d) {
   ["is_command_cursor"]=>
   bool(false)
 }
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(18) {
     ["stamp"]=>

tests/standalone/manager-executeCommand-001.phpt

@@ -12,7 +12,7 @@ $command = new MongoDB\Driver\Command(array('ping' => 1));
 $result = $manager->executeCommand(DATABASE_NAME, $command);
 var_dump($command);
 
-var_dump($result instanceof MongoDB\Driver\CommandResult);
+var_dump($result instanceof MongoDB\Driver\Result);
 var_dump($result);
 
 echo "Dumping response document:\n";
@@ -39,7 +39,7 @@ object(MongoDB\Driver\Command)#%d (1) {
   }
 }
 bool(true)
-object(MongoDB\Driver\CommandResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(19) {
     ["stamp"]=>

tests/standalone/manager-executeQuery-001.phpt

@@ -18,7 +18,7 @@ $manager->executeWriteBatch(NS, $batch);
 $query = new MongoDB\Driver\Query(array('x' => 3), array('projection' => array('y' => 1)));
 $qr = $manager->executeQuery(NS, $query);
 
-var_dump($qr instanceof MongoDB\Driver\QueryResult);
+var_dump($qr instanceof MongoDB\Driver\Result);
 var_dump($qr);
 
 $server = $qr->getServer();
@@ -34,7 +34,7 @@ var_dump(iterator_to_array($qr));
 <?php exit(0); ?>
 --EXPECTF--
 bool(true)
-object(MongoDB\Driver\QueryResult)#%d (%d) {
+object(MongoDB\Driver\Result)#%d (%d) {
   ["cursor"]=>
   array(19) {
     ["stamp"]=>

tests/standalone/server-executeCommand-001.phpt

@@ -12,7 +12,7 @@ $server = new MongoDB\Driver\Server($parsed["host"], $parsed["port"]);
 $command = new MongoDB\Driver\Command(array('isMaster' => 1));
 $result = $server->executeCommand(DATABASE_NAME, $command);
 
-var_dump($result instanceof MongoDB\Driver\CommandResult);
+var_dump($result instanceof MongoDB\Driver\Result);
 
 $responseDocument = $result->toArray();
 

tests/standalone/server-executeQuery-001.phpt

@@ -19,7 +19,7 @@ $server->executeWriteBatch(NS, $batch);
 $query = new MongoDB\Driver\Query(array('x' => 3), array('projection' => array('y' => 1)));
 $cursor = $server->executeQuery(NS, $query);
 
-var_dump($cursor instanceof MongoDB\Driver\QueryResult);
+var_dump($cursor instanceof MongoDB\Driver\Result);
 var_dump($server == $cursor->getServer());
 var_dump(iterator_to_array($cursor));
 

tests/standalone/server-executeQuery-002.phpt

@@ -19,7 +19,7 @@ $server->executeWriteBatch(NS, $batch);
 $query = new MongoDB\Driver\Query(array(), array('sort' => array('_id' => -1)));
 $cursor = $server->executeQuery(NS, $query);
 
-var_dump($cursor instanceof MongoDB\Driver\QueryResult);
+var_dump($cursor instanceof MongoDB\Driver\Result);
 var_dump($server == $cursor->getServer());
 var_dump(iterator_to_array($cursor));
 

tests/standalone/server-executeQuery-003.phpt

@@ -19,7 +19,7 @@ $server->executeWriteBatch(NS, $batch);
 $query = new MongoDB\Driver\Query(array(), array('modifiers' => array('$comment' => 'foo')));
 $cursor = $server->executeQuery(NS, $query);
 
-var_dump($cursor instanceof MongoDB\Driver\QueryResult);
+var_dump($cursor instanceof MongoDB\Driver\Result);
 var_dump($server == $cursor->getServer());
 var_dump(iterator_to_array($cursor));