PHPC-1925: Change ServerDescription::getType() to return a string

Author: tanlisu

src/MongoDB/ServerDescription.c

@@ -28,6 +28,16 @@
 
 zend_class_entry* php_phongo_serverdescription_ce;
 
+#define PHONGO_SERVER_UNKNOWN "Unknown"
+#define PHONGO_SERVER_STANDALONE "Standalone"
+#define PHONGO_SERVER_MONGOS "Mongos"
+#define PHONGO_SERVER_POSSIBLE_PRIMARY "PossiblePrimary"
+#define PHONGO_SERVER_RS_PRIMARY "RSPrimary"
+#define PHONGO_SERVER_RS_SECONDARY "RSSecondary"
+#define PHONGO_SERVER_RS_ARBITER "RSArbiter"
+#define PHONGO_SERVER_RS_OTHER "RSOther"
+#define PHONGO_SERVER_RS_GHOST "RSGhost"
+
 /* {{{ proto array MongoDB\Driver\ServerDescription::getHelloResponse()
    Returns the most recent "hello" response */
 static PHP_METHOD(ServerDescription, getHelloResponse)
@@ -105,7 +115,7 @@ static PHP_METHOD(ServerDescription, getRoundTripTime)
 	RETVAL_LONG(mongoc_server_description_round_trip_time(intern->server_description));
 } /* }}} */
 
-/* {{{ proto integer MongoDB\Driver\ServerDescription::getType()
+/* {{{ proto string MongoDB\Driver\ServerDescription::getType()
    Returns the server’s node type */
 static PHP_METHOD(ServerDescription, getType)
 {
@@ -115,7 +125,7 @@ static PHP_METHOD(ServerDescription, getType)
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	RETVAL_LONG(php_phongo_server_description_type(intern->server_description));
+	RETVAL_STRING(mongoc_server_description_type(intern->server_description));
 } /* }}} */
 
 /* {{{ MongoDB\Driver\ServerDescription function entries */
@@ -250,15 +260,15 @@ void php_phongo_serverdescription_init_ce(INIT_FUNC_ARGS) /* {{{ */
 	php_phongo_handler_serverdescription.free_obj       = php_phongo_serverdescription_free_object;
 	php_phongo_handler_serverdescription.offset         = XtOffsetOf(php_phongo_serverdescription_t, std);
 
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_UNKNOWN"), PHONGO_SERVER_UNKNOWN);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_STANDALONE"), PHONGO_SERVER_STANDALONE);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_MONGOS"), PHONGO_SERVER_MONGOS);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_POSSIBLE_PRIMARY"), PHONGO_SERVER_POSSIBLE_PRIMARY);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_PRIMARY"), PHONGO_SERVER_RS_PRIMARY);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_SECONDARY"), PHONGO_SERVER_RS_SECONDARY);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_ARBITER"), PHONGO_SERVER_RS_ARBITER);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_OTHER"), PHONGO_SERVER_RS_OTHER);
-	zend_declare_class_constant_long(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_GHOST"), PHONGO_SERVER_RS_GHOST);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_UNKNOWN"), PHONGO_SERVER_UNKNOWN);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_STANDALONE"), PHONGO_SERVER_STANDALONE);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_MONGOS"), PHONGO_SERVER_MONGOS);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_POSSIBLE_PRIMARY"), PHONGO_SERVER_POSSIBLE_PRIMARY);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_PRIMARY"), PHONGO_SERVER_RS_PRIMARY);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_SECONDARY"), PHONGO_SERVER_RS_SECONDARY);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_ARBITER"), PHONGO_SERVER_RS_ARBITER);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_OTHER"), PHONGO_SERVER_RS_OTHER);
+	zend_declare_class_constant_string(php_phongo_serverdescription_ce, ZEND_STRL("TYPE_RS_GHOST"), PHONGO_SERVER_RS_GHOST);
 } /* }}} */
 
 /*

tests/serverDescription/serverDescription-constants.phpt

@@ -17,13 +17,13 @@ var_dump(MongoDB\Driver\ServerDescription::TYPE_RS_GHOST);
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-int(0)
-int(1)
-int(2)
-int(3)
-int(4)
-int(5)
-int(6)
-int(7)
-int(8)
+string(7) "Unknown"
+string(10) "Standalone"
+string(6) "Mongos"
+string(15) "PossiblePrimary"
+string(9) "RSPrimary"
+string(11) "RSSecondary"
+string(9) "RSArbiter"
+string(7) "RSOther"
+string(7) "RSGhost"
 ===DONE===