PHPC-224: Consolidate Result and Cursor classes into one

This class is now simply Traversable (no longer IteratorAggregate) and adds isDead() and getId() methods from the original Cursor class.

Author: jmikola

config.m4

@@ -151,11 +151,11 @@ if test "$MONGODB" != "no"; then
   ";
   MONGODB_MONGODB_CLASSES="\
       src/MongoDB/Command.c \
+      src/MongoDB/Cursor.c \
       src/MongoDB/CursorId.c \
       src/MongoDB/Manager.c \
       src/MongoDB/Query.c \
       src/MongoDB/ReadPreference.c \
-      src/MongoDB/Result.c \
       src/MongoDB/Server.c \
       src/MongoDB/BulkWrite.c \
       src/MongoDB/WriteConcern.c \

config.w32

@@ -9,7 +9,7 @@ if (PHP_MONGODB != "no") {
   EXTENSION("mongodb", "php_phongo.c");
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/BSON", "Type.c Unserializable.c Serializable.c Persistable.c Binary.c Javascript.c MaxKey.c MinKey.c ObjectID.c Regex.c Timestamp.c UTCDatetime.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Command.c CursorId.c Manager.c Query.c ReadPreference.c Result.c Server.c BulkWrite.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Command.c Cursor.c CursorId.c Manager.c Query.c ReadPreference.c Server.c BulkWrite.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Exception.c RuntimeException.c InvalidArgumentException.c ConnectionException.c AuthenticationException.c SSLConnectionException.c DuplicateKeyException.c ExecutionTimeoutException.c ConnectionTimeoutException.c WriteException.c WriteConcernException.c BulkWriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libbson/src/yajl", "yajl_version.c yajl.c yajl_encode.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_alloc.c yajl_gen.c", "mongodb");

docs/crud.md

@@ -75,7 +75,7 @@ $query = new MongoDB\Driver\Query(array());
 try {
 	/* Full namespace as the first argument (dbname.collname), and the query object
 	 * to execute as the second.
-	 * Returns MongoDB\Driver\Result on success, throws exception on failure
+	 * Returns MongoDB\Driver\Cursor on success, throws exception on failure
 	 */
 	$cursor = $manager->executeQuery("db.collection", $query, $rp);