Revert "PHPC-1004: Rename CursorId to CursorID"

This reverts commit 708c214.

Author: jmikola

config.m4

@@ -180,7 +180,7 @@ if test "$MONGODB" != "no"; then
     src/MongoDB/BulkWrite.c \
     src/MongoDB/Command.c \
     src/MongoDB/Cursor.c \
-    src/MongoDB/CursorID.c \
+    src/MongoDB/CursorId.c \
     src/MongoDB/Manager.c \
     src/MongoDB/Query.c \
     src/MongoDB/ReadConcern.c \

config.w32

@@ -85,7 +85,7 @@ if (PHP_MONGODB != "no") {
   EXTENSION("mongodb", "php_phongo.c phongo_compat.c", null, PHP_MONGODB_CFLAGS);
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c bson-encode.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c Decimal128.c Decimal128Interface.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectID.c ObjectIDInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Timestamp.c TimestampInterface.c Type.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorID.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorId.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c ConnectionException.c ConnectionTimeoutException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Monitoring", "CommandFailedEvent.c CommandStartedEvent.c CommandSubscriber.c CommandSucceededEvent.c Subscriber.c functions.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", PHP_MONGODB_BSON_SOURCES, "mongodb");

src/MongoDB/Cursor.c

@@ -270,7 +270,7 @@ static PHP_METHOD(Cursor, toArray)
 	}
 } /* }}} */
 
-/* {{{ proto MongoDB\Driver\CursorID MongoDB\Driver\Cursor::getId()
+/* {{{ proto MongoDB\Driver\CursorId MongoDB\Driver\Cursor::getId()
    Returns the CursorId for this cursor */
 static PHP_METHOD(Cursor, getId)
 {

src/MongoDB/CursorID.c src/MongoDB/CursorId.csrc/MongoDB/CursorID.c renamed to src/MongoDB/CursorId.c

@@ -26,9 +26,9 @@
 
 zend_class_entry *php_phongo_cursorid_ce;
 
-/* {{{ proto string MongoDB\Driver\CursorID::__toString()
-   Returns the string representation of the CursorID */
-static PHP_METHOD(CursorID, __toString)
+/* {{{ proto string MongoDB\Driver\CursorId::__toString()
+   Returns the string representation of the CursorId */
+static PHP_METHOD(CursorId, __toString)
 {
 	php_phongo_cursorid_t    *intern;
 	char *tmp;
@@ -46,19 +46,19 @@ static PHP_METHOD(CursorID, __toString)
 	efree(tmp);
 } /* }}} */
 
-/* {{{ MongoDB\Driver\CursorID function entries */
-ZEND_BEGIN_ARG_INFO_EX(ai_CursorID_void, 0, 0, 0)
+/* {{{ MongoDB\Driver\CursorId function entries */
+ZEND_BEGIN_ARG_INFO_EX(ai_CursorId_void, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 static zend_function_entry php_phongo_cursorid_me[] = {
-	PHP_ME(CursorID, __toString, ai_CursorID_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	ZEND_NAMED_ME(__construct, PHP_FN(MongoDB_disabled___construct), ai_CursorID_void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
-	ZEND_NAMED_ME(__wakeup, PHP_FN(MongoDB_disabled___wakeup), ai_CursorID_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	PHP_ME(CursorId, __toString, ai_CursorId_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	ZEND_NAMED_ME(__construct, PHP_FN(MongoDB_disabled___construct), ai_CursorId_void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+	ZEND_NAMED_ME(__wakeup, PHP_FN(MongoDB_disabled___wakeup), ai_CursorId_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
 /* }}} */
 
-/* {{{ MongoDB\Driver\CursorID object handlers */
+/* {{{ MongoDB\Driver\CursorId object handlers */
 static zend_object_handlers php_phongo_handler_cursorid;
 
 static void php_phongo_cursorid_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
@@ -131,7 +131,7 @@ void php_phongo_cursorid_init_ce(INIT_FUNC_ARGS) /* {{{ */
 {
 	zend_class_entry ce;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorID", php_phongo_cursorid_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorId", php_phongo_cursorid_me);
 	php_phongo_cursorid_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_cursorid_ce->create_object = php_phongo_cursorid_create_object;
 	PHONGO_CE_FINAL(php_phongo_cursorid_ce);

tests/cursorid/cursorid_error-001.phpt

@@ -1,12 +1,12 @@
 --TEST--
-MongoDB\Driver\CursorID cannot be extended
+MongoDB\Driver\CursorId cannot be extended
 --FILE--
 <?php
 
-class MyCursorID extends MongoDB\Driver\CursorID {}
+class MyCursorId extends MongoDB\Driver\CursorId {}
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Fatal error: Class MyCursorID may not inherit from final class (MongoDB\Driver\CursorID) in %s on line %d
+Fatal error: Class MyCursorId may not inherit from final class (MongoDB\Driver\CursorId) in %s on line %d

tests/functional/cursorid-001.phpt

@@ -30,7 +30,7 @@ var_dump($s1 > 0);
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-object(MongoDB\Driver\CursorID)#%d (%d) {
+object(MongoDB\Driver\CursorId)#%d (%d) {
   ["id"]=>
   %rint\(\d+\)|string\(\d+\) "\d+"%r
 }