Update ServerOpeningEvent::getHost(), add getPort()

Author: tanlisu

php_phongo_structs.h

@@ -285,9 +285,10 @@ typedef struct {
 } php_phongo_commandsucceededevent_t;
 
 typedef struct {
-	bson_oid_t                topology_id;
-	const mongoc_host_list_t* host;
-	zend_object               std;
+	bson_oid_t  topology_id;
+	char        host[BSON_HOST_NAME_MAX + 1];
+	uint16_t    port;
+	zend_object std;
 } php_phongo_serveropeningevent_t;
 
 typedef struct {

src/MongoDB/Monitoring/ServerOpeningEvent.c

@@ -34,7 +34,18 @@ static PHP_METHOD(ServerOpeningEvent, getHost)
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	RETVAL_STRING((intern->host)->host);
+	RETVAL_STRING(intern->host);
+} /* }}} */
+
+/* {{{ proto integer ServerOpeningEvent::getPort()
+   Returns this event's port */
+static PHP_METHOD(ServerOpeningEvent, getPort)
+{
+	php_phongo_serveropeningevent_t* intern = Z_SERVEROPENINGEVENT_OBJ_P(getThis());
+
+	PHONGO_PARSE_PARAMETERS_NONE();
+
+	RETVAL_LONG(intern->port);
 } /* }}} */
 
 /* {{{ proto MongoDB\BSON\ObjectId ServerOpeningEvent::getTopologyId()
@@ -61,6 +72,7 @@ static zend_function_entry php_phongo_serveropeningevent_me[] = {
 	/* clang-format off */
 	ZEND_NAMED_ME(__construct, PHP_FN(MongoDB_disabled___construct), ai_ServerOpeningEvent_void, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
 	PHP_ME(ServerOpeningEvent, getHost, ai_ServerOpeningEvent_void, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
+	PHP_ME(ServerOpeningEvent, getPort, ai_ServerOpeningEvent_void, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
 	PHP_ME(ServerOpeningEvent, getTopologyId, ai_ServerOpeningEvent_void, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
 	ZEND_NAMED_ME(__wakeup, PHP_FN(MongoDB_disabled___wakeup), ai_ServerOpeningEvent_void, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
 	PHP_FE_END
@@ -100,9 +112,10 @@ static HashTable* php_phongo_serveropeningevent_get_debug_info(phongo_compat_obj
 
 	intern   = Z_OBJ_SERVEROPENINGEVENT(PHONGO_COMPAT_GET_OBJ(object));
 	*is_temp = 1;
-	array_init_size(&retval, 2);
+	array_init_size(&retval, 3);
 
-	ADD_ASSOC_STRING(&retval, "host", (intern->host)->host);
+	ADD_ASSOC_STRING(&retval, "host", intern->host);
+	ADD_ASSOC_LONG_EX(&retval, "port", intern->port);
 
 	bson_oid_to_string(&intern->topology_id, topology_id);
 	ADD_ASSOC_STRING(&retval, "topologyId", topology_id);

src/phongo_apm.c

@@ -268,6 +268,7 @@ static void phongo_apm_server_opening(const mongoc_apm_server_opening_t* event)
 	HashTable*                       subscribers;
 	php_phongo_serveropeningevent_t* p_event;
 	zval                             z_event;
+	const mongoc_host_list_t*        host_list;
 
 	client      = mongoc_apm_server_opening_get_context(event);
 	subscribers = phongo_apm_get_subscribers_to_notify(php_phongo_sdamsubscriber_ce, client);
@@ -280,8 +281,11 @@ static void phongo_apm_server_opening(const mongoc_apm_server_opening_t* event)
 	object_init_ex(&z_event, php_phongo_serveropeningevent_ce);
 	p_event = Z_SERVEROPENINGEVENT_OBJ_P(&z_event);
 
+	host_list = mongoc_apm_server_opening_get_host(event);
+	memcpy(&p_event->host, &host_list->host, BSON_HOST_NAME_MAX + 1);
+	p_event->port = host_list->port;
+
 	mongoc_apm_server_opening_get_topology_id(event, &p_event->topology_id);
-	p_event->host = mongoc_apm_server_opening_get_host(event);
 
 	phongo_apm_dispatch_event(subscribers, "serverOpening", &z_event);
 	zval_ptr_dtor(&z_event);

tests/apm/monitoring-serverOpening-001.phpt

@@ -21,6 +21,7 @@ class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
 
         $this->serverOpened = true;
         echo "- getHost() returns a string: ", is_string($event->getHost()) ? 'yes' : 'no', "\n";
+        echo "- getPort() returns an integer: ", is_integer($event->getPort()) ? 'yes' : 'no', "\n";
         echo "- getTopologyId() returns an ObjectId: ", ($event->getTopologyId() instanceof MongoDB\BSON\ObjectId) ? 'yes' : 'no', "\n";
     }
 
@@ -40,5 +41,6 @@ $m->executeCommand(DATABASE_NAME, $command);
 <?php exit(0); ?>
 --EXPECT--
 - getHost() returns a string: yes
+- getPort() returns an integer: yes
 - getTopologyId() returns an ObjectId: yes
 ===DONE===