From 82607a90f72d95d526928865eeb27b3f9417b137 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@php.net>
Date: Wed, 8 Apr 2015 05:26:48 +0000
Subject: [PATCH] Traversable MongoDB\Driver\Cursor replaces Result class

As of 0.4, the Result and Cursor classes, which were IteratorAggregate and Iterator, respectively, are consolidated into a single, Traversable Cursor class.

https://jira.mongodb.org/browse/PHPC-224


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@336451 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongodb/mongodb.xml                 |   2 -
 reference/mongodb/mongodb/driver/command.xml  |   8 +-
 .../mongodb/driver/command/construct.xml      |   5 +-
 reference/mongodb/mongodb/driver/cursor.xml   |   8 +-
 .../mongodb/driver/cursor/construct.xml       |  15 +--
 .../mongodb/mongodb/driver/cursor/current.xml |  93 ---------------
 .../mongodb/driver/cursor/getbatchsize.xml    |  93 ---------------
 .../mongodb/mongodb/driver/cursor/getid.xml   |   4 +-
 .../mongodb/driver/cursor/getserver.xml       |   4 +-
 .../mongodb/mongodb/driver/cursor/isdead.xml  |   4 +-
 .../mongodb/mongodb/driver/cursor/key.xml     |  93 ---------------
 .../mongodb/mongodb/driver/cursor/kill.xml    |  93 ---------------
 .../mongodb/mongodb/driver/cursor/next.xml    |  93 ---------------
 .../mongodb/mongodb/driver/cursor/rewind.xml  |  93 ---------------
 .../mongodb/driver/cursor/setbatchsize.xml    | 102 ----------------
 .../driver/{result => cursor}/settypemap.xml  |  12 +-
 .../driver/{result => cursor}/toarray.xml     |  12 +-
 .../mongodb/mongodb/driver/cursor/valid.xml   |  93 ---------------
 .../mongodb/driver/manager/executecommand.xml |  11 +-
 .../mongodb/driver/manager/executequery.xml   |  10 +-
 .../mongodb/driver/query/construct.xml        |   6 +-
 reference/mongodb/mongodb/driver/result.xml   |  80 -------------
 .../mongodb/driver/result/construct.xml       | 111 ------------------
 .../mongodb/driver/result/getiterator.xml     |  93 ---------------
 .../mongodb/driver/result/getserver.xml       |  93 ---------------
 .../driver/result/setiteratorclass.xml        | 102 ----------------
 .../driver/result/setiteratorinitcallback.xml | 102 ----------------
 reference/mongodb/versions.xml                |  19 +--
 28 files changed, 50 insertions(+), 1404 deletions(-)
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/current.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/getbatchsize.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/key.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/kill.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/next.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/rewind.xml
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/setbatchsize.xml
 rename reference/mongodb/mongodb/driver/{result => cursor}/settypemap.xml (82%)
 rename reference/mongodb/mongodb/driver/{result => cursor}/toarray.xml (80%)
 delete mode 100644 reference/mongodb/mongodb/driver/cursor/valid.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result/construct.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result/getiterator.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result/getserver.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result/setiteratorclass.xml
 delete mode 100644 reference/mongodb/mongodb/driver/result/setiteratorinitcallback.xml

diff --git a/reference/mongodb/mongodb.xml b/reference/mongodb/mongodb.xml
index 4045991578..cdfbb0f443 100644
--- a/reference/mongodb/mongodb.xml
+++ b/reference/mongodb/mongodb.xml
@@ -10,8 +10,6 @@
   &reference.mongodb.mongodb.driver.query;
   &reference.mongodb.mongodb.driver.bulkwrite;
 
-  &reference.mongodb.mongodb.driver.result;
-
   &reference.mongodb.mongodb.driver.writeconcern;
   &reference.mongodb.mongodb.driver.readpreference;
 
diff --git a/reference/mongodb/mongodb/driver/command.xml b/reference/mongodb/mongodb/driver/command.xml
index 6720e3d78f..7e55577242 100644
--- a/reference/mongodb/mongodb/driver/command.xml
+++ b/reference/mongodb/mongodb/driver/command.xml
@@ -95,13 +95,13 @@ $createCollection->setCappedCollection(64 * 1024);
 
 try {
     $command = $createCollection->getCommand();
-    $result = $manager->executeCommand("databaseName", $command);
-    $response = $result->getResponseDocument();
+    $cursor = $manager->executeCommand("databaseName", $command);
+    $response = $cursor->toArray()[0];
     var_dump($response);
 
     $collstats = ["collstats" => $createCollection->getCollectionName()];
-    $result = $manager->executeCommand("databaseName", new MongoDB\Driver\Command($collstats));
-    $response = $result->getResponseDocument();
+    $cursor = $manager->executeCommand("databaseName", new MongoDB\Driver\Command($collstats));
+    $response = $cursor->toArray()[0];
     var_dump($response);
 } catch(MongoDB\Driver\Exception $e) {
     echo $e->getMessage(), "\n";
diff --git a/reference/mongodb/mongodb/driver/command/construct.xml b/reference/mongodb/mongodb/driver/command/construct.xml
index 2817b1a594..ec9a3aed5c 100644
--- a/reference/mongodb/mongodb/driver/command/construct.xml
+++ b/reference/mongodb/mongodb/driver/command/construct.xml
@@ -53,8 +53,8 @@ $manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
 $command = new MongoDB\Driver\Command(array("buildinfo" => 1));
 
 try {
-    $result = $manager->executeCommand("admin", $command);
-    $response = $result->getResponseDocument();
+    $cursor = $manager->executeCommand("admin", $command);
+    $response = $cursor->toArray()[0];
 } catch(MongoDB\Driver\Exception $e) {
     echo $e->getMessage(), "\n";
     exit;
@@ -116,6 +116,7 @@ array(13) {
   &reftitle.seealso;
   <simplelist>
    <member><methodname>MongoDB\Driver\Manager::executeCommand</methodname></member>
+   <member><classname>MongoDB\Driver\Cursor</classname></member>
   </simplelist>
  </refsect1>
 
diff --git a/reference/mongodb/mongodb/driver/cursor.xml b/reference/mongodb/mongodb/driver/cursor.xml
index 60c5a6cca8..5ff8d4cc6a 100644
--- a/reference/mongodb/mongodb/driver/cursor.xml
+++ b/reference/mongodb/mongodb/driver/cursor.xml
@@ -11,6 +11,12 @@
 <!-- {{{ MongoDB\Driver\Cursor intro -->
   <section xml:id="mongodb-driver-cursor.intro">
    &reftitle.intro;
+   <para>
+    The <classname>MongoDB\Driver\Cursor</classname> class encapsulates
+    the results of a MongoDB command or query and may be returned by
+    <methodname>MongoDB\Driver\Manager::executeCommand</methodname> or
+    <methodname>MongoDB\Driver\Manager::executeQuery</methodname>, respectively.
+   </para>
    <para>
 
    </para>
@@ -31,7 +37,7 @@
      </ooclass>
      
      <oointerface>
-      <interfacename>Iterator</interfacename>
+      <interfacename>Traversable</interfacename>
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mongodb/mongodb/driver/cursor/construct.xml b/reference/mongodb/mongodb/driver/cursor/construct.xml
index dde8a02799..b325c7257d 100644
--- a/reference/mongodb/mongodb/driver/cursor/construct.xml
+++ b/reference/mongodb/mongodb/driver/cursor/construct.xml
@@ -10,10 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDB\Driver\Cursor::__construct</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\Cursor::__construct</methodname>
    <methodparam><type>Server</type><parameter>server</parameter></methodparam>
-   <methodparam><type>CursorId</type><parameter>cursorId</parameter></methodparam>
-   <methodparam><type>array</type><parameter>firstBatch</parameter></methodparam>
+   <methodparam><type>string</type><parameter>responseDocument</parameter></methodparam>
   </methodsynopsis>
   <para>
 
@@ -33,15 +32,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>cursorId</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>firstBatch</parameter></term>
+    <term><parameter>responseDocument</parameter></term>
     <listitem>
      <para>
       
diff --git a/reference/mongodb/mongodb/driver/cursor/current.xml b/reference/mongodb/mongodb/driver/cursor/current.xml
deleted file mode 100644
index 8ad44de1f1..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/current.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::current</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::current</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/getbatchsize.xml b/reference/mongodb/mongodb/driver/cursor/getbatchsize.xml
deleted file mode 100644
index a3a62fdcfa..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/getbatchsize.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.getbatchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::getBatchSize</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::getBatchSize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::getBatchSize</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/getid.xml b/reference/mongodb/mongodb/driver/cursor/getid.xml
index acc2db4265..6ec9a75211 100644
--- a/reference/mongodb/mongodb/driver/cursor/getid.xml
+++ b/reference/mongodb/mongodb/driver/cursor/getid.xml
@@ -4,13 +4,13 @@
 <refentry xml:id="mongodb-driver-cursor.getid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\Driver\Cursor::getId</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Returns the CursorId for this cursor</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::getId</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\CursorId</type><methodname>MongoDB\Driver\Cursor::getId</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/mongodb/mongodb/driver/cursor/getserver.xml b/reference/mongodb/mongodb/driver/cursor/getserver.xml
index bb23055dcf..ef263571b1 100644
--- a/reference/mongodb/mongodb/driver/cursor/getserver.xml
+++ b/reference/mongodb/mongodb/driver/cursor/getserver.xml
@@ -4,13 +4,13 @@
 <refentry xml:id="mongodb-driver-cursor.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\Driver\Cursor::getServer</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Returns the Server object to which this cursor is attached</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::getServer</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Cursor::getServer</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/mongodb/mongodb/driver/cursor/isdead.xml b/reference/mongodb/mongodb/driver/cursor/isdead.xml
index ac1026cc95..ce022f79b8 100644
--- a/reference/mongodb/mongodb/driver/cursor/isdead.xml
+++ b/reference/mongodb/mongodb/driver/cursor/isdead.xml
@@ -4,13 +4,13 @@
 <refentry xml:id="mongodb-driver-cursor.isdead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoDB\Driver\Cursor::isDead</refname>
-  <refpurpose>Description</refpurpose>
+  <refpurpose>Checks if a cursor is still alive</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::isDead</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Cursor::isDead</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/mongodb/mongodb/driver/cursor/key.xml b/reference/mongodb/mongodb/driver/cursor/key.xml
deleted file mode 100644
index dcc200433e..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/key.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::key</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::key</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/kill.xml b/reference/mongodb/mongodb/driver/cursor/kill.xml
deleted file mode 100644
index b700a163cb..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/kill.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.kill" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::kill</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::kill</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::kill</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/next.xml b/reference/mongodb/mongodb/driver/cursor/next.xml
deleted file mode 100644
index d39e300e7a..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/next.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::next</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::next</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/rewind.xml b/reference/mongodb/mongodb/driver/cursor/rewind.xml
deleted file mode 100644
index bd59791140..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/rewind.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::rewind</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::rewind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/cursor/setbatchsize.xml b/reference/mongodb/mongodb/driver/cursor/setbatchsize.xml
deleted file mode 100644
index 10a82b4d00..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/setbatchsize.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.setbatchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::setBatchSize</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::setBatchSize</methodname>
-   <methodparam><type>string</type><parameter>batchSize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>batchSize</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::setBatchSize</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/settypemap.xml b/reference/mongodb/mongodb/driver/cursor/settypemap.xml
similarity index 82%
rename from reference/mongodb/mongodb/driver/result/settypemap.xml
rename to reference/mongodb/mongodb/driver/cursor/settypemap.xml
index 9abba4da22..d5b2199033 100644
--- a/reference/mongodb/mongodb/driver/result/settypemap.xml
+++ b/reference/mongodb/mongodb/driver/cursor/settypemap.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision: 336263 $ --> 
 
-<refentry xml:id="mongodb-driver-Result.settypemap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="mongodb-driver-cursor.settypemap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MongoDB\Driver\Result::setTypemap</refname>
-  <refpurpose>Description</refpurpose>
+  <refname>MongoDB\Driver\Cursor::setTypeMap</refname>
+  <refpurpose>Sets a type map to use for BSON unserialization</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::setTypemap</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Cursor::setTypeMap</methodname>
    <methodparam><type>array</type><parameter>typemap</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -51,7 +51,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>MongoDB\Driver\Result::setTypemap</function> example</title>
+   <title><function>MongoDB\Driver\Cursor::setTypeMap</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/mongodb/mongodb/driver/result/toarray.xml b/reference/mongodb/mongodb/driver/cursor/toarray.xml
similarity index 80%
rename from reference/mongodb/mongodb/driver/result/toarray.xml
rename to reference/mongodb/mongodb/driver/cursor/toarray.xml
index 21c951764a..908d819dbb 100644
--- a/reference/mongodb/mongodb/driver/result/toarray.xml
+++ b/reference/mongodb/mongodb/driver/cursor/toarray.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
+<!-- $Revision: 336263 $ --> 
 
-<refentry xml:id="mongodb-driver-result.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="mongodb-driver-cursor.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>MongoDB\Driver\Result::toArray</refname>
-  <refpurpose>Description</refpurpose>
+  <refname>MongoDB\Driver\Cursor::toArray</refname>
+  <refpurpose>Returns an array of all result documents for this cursor</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::toArray</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Cursor::toArray</methodname>
    <void />
   </methodsynopsis>
   <para>
@@ -42,7 +42,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>MongoDB\Driver\Result::toArray</function> example</title>
+   <title><function>MongoDB\Driver\Cursor::toArray</function> example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/mongodb/mongodb/driver/cursor/valid.xml b/reference/mongodb/mongodb/driver/cursor/valid.xml
deleted file mode 100644
index c0d33e6e23..0000000000
--- a/reference/mongodb/mongodb/driver/cursor/valid.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-cursor.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::valid</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Cursor::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::valid</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/manager/executecommand.xml b/reference/mongodb/mongodb/driver/manager/executecommand.xml
index d271982579..a96a4efc17 100644
--- a/reference/mongodb/mongodb/driver/manager/executecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executecommand.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Result</type><methodname>MongoDB\Driver\Manager::executeCommand</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeCommand</methodname>
    <methodparam><type>string</type><parameter>db</parameter></methodparam>
    <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
    <methodparam choice="opt"><type>MongoDB\Driver\ReadPreference</type><parameter>readPreference</parameter></methodparam>
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns <classname>MongoDB\Driver\Result</classname> on success, &mongodb.throws.onfailure;.
+   Returns <classname>MongoDB\Driver\Cursor</classname> on success, &mongodb.throws.onfailure;.
   </para>
  </refsect1>
 
@@ -72,8 +72,8 @@ $manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
 $command = new MongoDB\Driver\Command(array("ping" => 1));
 
 try {
-    $result = $manager->executeCommand("admin", $command);
-    $response = $result->getResponseDocument();
+    $cursor = $manager->executeCommand("admin", $command);
+    $response = $cursor->toArray()[0];
 } catch(MongoDB\Driver\Exception $e) {
     echo $e->getMessage(), "\n";
     exit;
@@ -118,8 +118,7 @@ array(1) {
   &reftitle.seealso;
   <simplelist>
    <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Result</classname></member>
-   <member><methodname>MongoDB\Driver\Result::getResponseDocument</methodname></member>
+   <member><classname>MongoDB\Driver\Cursor</classname></member>
    <member><classname>MongoDB\Driver\ReadPreference</classname></member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/manager/executequery.xml b/reference/mongodb/mongodb/driver/manager/executequery.xml
index 07099786d3..c95ba091ad 100644
--- a/reference/mongodb/mongodb/driver/manager/executequery.xml
+++ b/reference/mongodb/mongodb/driver/manager/executequery.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Result</type><methodname>MongoDB\Driver\Manager::executeQuery</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeQuery</methodname>
    <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
    <methodparam><type>MongoDB\Driver\Query</type><parameter>query</parameter></methodparam>
    <methodparam choice="opt"><type>MongoDB\Driver\ReadPreference</type><parameter>readPreference</parameter></methodparam>
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns <classname>MongoDB\Driver\Result</classname> on success, &mongodb.throws.onfailure;.
+   Returns <classname>MongoDB\Driver\Cursor</classname> on success, &mongodb.throws.onfailure;.
   </para>
  </refsect1>
 
@@ -76,9 +76,9 @@ $readPreference = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreferenc
 $query = new MongoDB\Driver\Query($filter, $options);
 
 $manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$result = $manager->executeQuery("databaseName.collectionName", $query, $readPreference);
+$cursor = $manager->executeQuery("databaseName.collectionName", $query, $readPreference);
 
-foreach($result as $document) {
+foreach($cursor as $document) {
     echo $document["title"], "\n";
 }
 
@@ -91,8 +91,8 @@ foreach($result as $document) {
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
+   <member><classname>MongoDB\Driver\Cursor</classname></member>
    <member><classname>MongoDB\Driver\Query</classname></member>
-   <member><classname>MongoDB\Driver\Result</classname></member>
    <member><classname>MongoDB\Driver\ReadPreference</classname></member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/query/construct.xml b/reference/mongodb/mongodb/driver/query/construct.xml
index 0b71d4cba4..52cc42d874 100644
--- a/reference/mongodb/mongodb/driver/query/construct.xml
+++ b/reference/mongodb/mongodb/driver/query/construct.xml
@@ -148,9 +148,9 @@ $query = new MongoDB\Driver\Query($filter, $options);
 
 $manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
 $readPreference = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
-$result = $manager->executeQuery("databaseName.collectionName", $query, $readPreference);
+$cursor = $manager->executeQuery("databaseName.collectionName", $query, $readPreference);
 
-foreach($result as $document) {
+foreach($cursor as $document) {
     var_dump($document);
 }
 
@@ -164,7 +164,7 @@ foreach($result as $document) {
   &reftitle.seealso;
   <simplelist>
    <member><methodname>MongoDB\Driver\Manager::executeQuery</methodname></member>
-   <member><classname>MongoDB\Driver\Result</classname></member>
+   <member><classname>MongoDB\Driver\Cursor</classname></member>
    <member><link xlink:href="&url.mongodb.docs;reference/operator/query-modifier/#modifiers">MongoDB Query Modifiers</link></member>
   </simplelist>
  </refsect1>
diff --git a/reference/mongodb/mongodb/driver/result.xml b/reference/mongodb/mongodb/driver/result.xml
deleted file mode 100644
index e2a08289c1..0000000000
--- a/reference/mongodb/mongodb/driver/result.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<phpdoc:classref xml:id="class.mongodb-driver-result" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MongoDB\Driver\Result class</title>
- <titleabbrev>MongoDB\Driver\Result</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Result intro -->
-  <section xml:id="mongodb-driver-result.intro">
-   &reftitle.intro;
-   <para>
-    The <classname>MongoDB\Driver\Result</classname> class encapsulates
-    the results of a MongoDB Command, returned by
-    <methodname>MongoDB\Driver\Manager::executeCommand</methodname>.
-   </para>
-   <para>
-
-   </para>
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-result.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Result</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Result</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>IteratorAggregate</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-result')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.result;
-
-</phpdoc:classref>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/construct.xml b/reference/mongodb/mongodb/driver/result/construct.xml
deleted file mode 100644
index 38b4503734..0000000000
--- a/reference/mongodb/mongodb/driver/result/construct.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-result.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Result::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\Result::__construct</methodname>
-   <methodparam><type>Server</type><parameter>server</parameter></methodparam>
-   <methodparam><type>string</type><parameter>responseDocument</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>server</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>responseDocument</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Result::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/getiterator.xml b/reference/mongodb/mongodb/driver/result/getiterator.xml
deleted file mode 100644
index b4578fd958..0000000000
--- a/reference/mongodb/mongodb/driver/result/getiterator.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-result.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Result::getIterator</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::getIterator</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Result::getIterator</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/getserver.xml b/reference/mongodb/mongodb/driver/result/getserver.xml
deleted file mode 100644
index dc35a0ff23..0000000000
--- a/reference/mongodb/mongodb/driver/result/getserver.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-result.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Result::getServer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Result::getServer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/setiteratorclass.xml b/reference/mongodb/mongodb/driver/result/setiteratorclass.xml
deleted file mode 100644
index f86715a110..0000000000
--- a/reference/mongodb/mongodb/driver/result/setiteratorclass.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-result.setiteratorclass" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Result::setIteratorClass</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::setIteratorClass</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Result::setIteratorClass</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/mongodb/driver/result/setiteratorinitcallback.xml b/reference/mongodb/mongodb/driver/result/setiteratorinitcallback.xml
deleted file mode 100644
index aa698b089d..0000000000
--- a/reference/mongodb/mongodb/driver/result/setiteratorinitcallback.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-driver-result.setiteratorinitcallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Result::setIteratorInitCallback</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>ReturnType</type><methodname>MongoDB\Driver\Result::setIteratorInitCallback</methodname>
-   <methodparam><type>string</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Result::setIteratorInitCallback</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member></member>
-  </simplelist>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mongodb/versions.xml b/reference/mongodb/versions.xml
index 6b1423a7eb..9f7bb51e95 100644
--- a/reference/mongodb/versions.xml
+++ b/reference/mongodb/versions.xml
@@ -15,28 +15,13 @@
  <function name='mongodb\driver\command' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\command::__construct' from='mongodb &gt;=0.2.0'/>
 
- <function name='mongodb\driver\result' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::__construct' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::settypemap' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::getiterator' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::setiteratorclass' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::setiteratorinitcallback' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::toarray' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\result::getserver' from='mongodb &gt;=0.2.0'/>
-
  <function name='mongodb\driver\cursor' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\cursor::__construct' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\cursor::getid' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\cursor::getserver' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\cursor::isdead' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::kill' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::getbatchsize' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::setbatchsize' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::current' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::key' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::next' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::rewind' from='mongodb &gt;=0.2.0'/>
- <function name='mongodb\driver\cursor::valid' from='mongodb &gt;=0.2.0'/>
+ <function name='mongodb\driver\cursor::settypemap' from='mongodb &gt;=0.4.0'/>
+ <function name='mongodb\driver\cursor::toarray' from='mongodb &gt;=0.4.0'/>
 
  <function name='mongodb\driver\cursorid' from='mongodb &gt;=0.2.0'/>
  <function name='mongodb\driver\cursorid::__construct' from='mongodb &gt;=0.2.0'/>