Declare __wakeup as lowercase for consistency

jmikola · jmikola · commit 4e26b503bdb4 · 2016-07-15T11:11:48.000-04:00
diff --git a/php_phongo_classes.h b/php_phongo_classes.h
@@ -235,7 +235,7 @@ extern PHONGO_API zend_class_entry *php_phongo_timestamp_ce;
 extern PHONGO_API zend_class_entry *php_phongo_utcdatetime_ce;
 
 /* Shared across all MongoDB\Driver objects to disable unserialize() */
-PHP_METHOD(Manager, __wakeUp);
+PHP_METHOD(Manager, __wakeup);
 /* Shared across all final MongoDB\Driver value objects, only possible to construct them internally */
 PHP_METHOD(Server, __construct);
 
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -273,7 +273,7 @@ static zend_function_entry php_phongo_bulkwrite_me[] = {
 	PHP_ME(BulkWrite, update, ai_BulkWrite_update, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(BulkWrite, delete, ai_BulkWrite_delete, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(BulkWrite, count, ai_BulkWrite_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_BulkWrite_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_BulkWrite_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/Command.c b/src/MongoDB/Command.c
@@ -86,7 +86,7 @@ ZEND_END_ARG_INFO()
 
 static zend_function_entry php_phongo_command_me[] = {
 	PHP_ME(Command, __construct, ai_Command___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_Command_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_Command_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c
@@ -197,7 +197,7 @@ static zend_function_entry php_phongo_cursor_me[] = {
 	PHP_ME(Cursor, getId, ai_Cursor_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Cursor, getServer, ai_Cursor_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Cursor, isDead, ai_Cursor_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_Cursor_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_Cursor_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/CursorId.c b/src/MongoDB/CursorId.c
@@ -73,7 +73,7 @@ ZEND_END_ARG_INFO()
 static zend_function_entry php_phongo_cursorid_me[] = {
 	PHP_ME(Server, __construct, ai_CursorId_void, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
 	PHP_ME(CursorId, __toString, ai_CursorId_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_CursorId_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_CursorId_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -273,9 +273,9 @@ PHP_METHOD(Manager, selectServer)
 }
 /* }}} */
 
-/* {{{ proto void MongoDB\Driver\Manager::__wakeUp()
+/* {{{ proto void MongoDB\Driver\Manager::__wakeup()
    Throws MongoDB\Driver\RuntimeException (serialization is not supported) */
-PHP_METHOD(Manager, __wakeUp)
+PHP_METHOD(Manager, __wakeup)
 {
 	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(this_ptr)
 
@@ -342,7 +342,7 @@ static zend_function_entry php_phongo_manager_me[] = {
 	PHP_ME(Manager, getServers, ai_Manager_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, getWriteConcern, ai_Manager_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, selectServer, ai_Manager_selectServer, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_Manager_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_Manager_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -115,7 +115,7 @@ ZEND_END_ARG_INFO()
 
 static zend_function_entry php_phongo_query_me[] = {
 	PHP_ME(Query, __construct, ai_Query___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_Query_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_Query_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -495,7 +495,7 @@ static zend_function_entry php_phongo_server_me[] = {
 	PHP_ME(Server, isArbiter, ai_Server_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Server, isHidden, ai_Server_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Server, isPassive, ai_Server_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_Server_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_Server_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
@@ -118,7 +118,7 @@ static zend_function_entry php_phongo_writeconcernerror_me[] = {
 	PHP_ME(WriteConcernError, getCode, ai_WriteConcernError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteConcernError, getInfo, ai_WriteConcernError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteConcernError, getMessage, ai_WriteConcernError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_WriteConcernError_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_WriteConcernError_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
@@ -139,7 +139,7 @@ static zend_function_entry php_phongo_writeerror_me[] = {
 	PHP_ME(WriteError, getIndex, ai_WriteError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteError, getMessage, ai_WriteError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteError, getInfo, ai_WriteError_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_WriteError_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_WriteError_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c
@@ -384,7 +384,7 @@ static zend_function_entry php_phongo_writeresult_me[] = {
 	PHP_ME(WriteResult, getWriteConcernError, ai_WriteResult_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteResult, getWriteErrors, ai_WriteResult_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(WriteResult, isAcknowledged, ai_WriteResult_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-	PHP_ME(Manager, __wakeUp, ai_WriteResult_void, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeup, ai_WriteResult_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
diff --git a/tests/manager/manager-wakeup.phpt b/tests/manager/manager-wakeup.phpt
@@ -8,16 +8,16 @@ require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(STANDALONE);
 throws(function() use($manager) {
-    $manager->__wakeUp();
+    $manager->__wakeup();
 }, "MongoDB\Driver\Exception\RuntimeException");
 
-$manager->__wakeUp(1, 2);
+$manager->__wakeup(1, 2);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 OK: Got MongoDB\Driver\Exception\RuntimeException
 
-Warning: MongoDB\Driver\Manager::__wakeUp() expects exactly 0 parameters, 2 given in %s on line %d
+Warning: MongoDB\Driver\Manager::__wakeup() expects exactly 0 parameters, 2 given in %s on line %d
 ===DONE===
