Add properties to TopologyOpeningEvent class

Author: alcaeus

src/MongoDB/Monitoring/TopologyOpeningEvent.c

@@ -37,6 +37,16 @@ static PHP_METHOD(MongoDB_Driver_Monitoring_TopologyOpeningEvent, getTopologyId)
 	phongo_objectid_new(return_value, &intern->topology_id);
 }
 
+static void phongo_topologyopeningevent_update_properties(phongo_topologyopeningevent_t* intern)
+{
+	zval topology_id;
+
+	if (phongo_objectid_new(&topology_id, &intern->topology_id)) {
+		zend_update_property(phongo_topologyopeningevent_ce, &intern->std, ZEND_STRL("topologyId"), &topology_id);
+		zval_ptr_dtor(&topology_id);
+	}
+}
+
 /* MongoDB\Driver\Monitoring\TopologyOpeningEvent object handlers */
 static zend_object_handlers phongo_handler_topologyopeningevent;
 
@@ -56,37 +66,21 @@ static zend_object* phongo_topologyopeningevent_create_object(zend_class_entry*
 	return &intern->std;
 }
 
-static HashTable* phongo_topologyopeningevent_get_debug_info(zend_object* object, int* is_temp)
-{
-	PHONGO_INTERN_FROM_Z_OBJ(topologyopeningevent, object);
-
-	zval retval = ZVAL_STATIC_INIT;
-
-	*is_temp = 1;
-	array_init_size(&retval, 1);
-
-	{
-		zval topology_id;
-
-		if (!phongo_objectid_new(&topology_id, &intern->topology_id)) {
-			/* Exception should already have been thrown */
-			goto done;
-		}
-
-		ADD_ASSOC_ZVAL_EX(&retval, "topologyId", &topology_id);
-	}
-
-done:
-	return Z_ARRVAL(retval);
-}
-
 void phongo_topologyopeningevent_init_ce(INIT_FUNC_ARGS)
 {
 	phongo_topologyopeningevent_ce                = register_class_MongoDB_Driver_Monitoring_TopologyOpeningEvent();
 	phongo_topologyopeningevent_ce->create_object = phongo_topologyopeningevent_create_object;
 
 	memcpy(&phongo_handler_topologyopeningevent, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
-	phongo_handler_topologyopeningevent.get_debug_info = phongo_topologyopeningevent_get_debug_info;
-	phongo_handler_topologyopeningevent.free_obj       = phongo_topologyopeningevent_free_object;
-	phongo_handler_topologyopeningevent.offset         = XtOffsetOf(phongo_topologyopeningevent_t, std);
+	phongo_handler_topologyopeningevent.free_obj = phongo_topologyopeningevent_free_object;
+	phongo_handler_topologyopeningevent.offset   = XtOffsetOf(phongo_topologyopeningevent_t, std);
+}
+
+void phongo_topologyopeningevent_init(zval* return_value, const mongoc_apm_topology_opening_t* event)
+{
+	PHONGO_INTERN_INIT_EX(topologyopeningevent, return_value);
+
+	mongoc_apm_topology_opening_get_topology_id(event, &intern->topology_id);
+
+	phongo_topologyopeningevent_update_properties(intern);
 }

src/MongoDB/Monitoring/TopologyOpeningEvent.stub.php

@@ -10,6 +10,8 @@
 /** @not-serializable */
 final class TopologyOpeningEvent
 {
+    public readonly \MongoDB\BSON\ObjectId $topologyId;
+
     final private function __construct() {}
 
     final public function getTopologyId(): \MongoDB\BSON\ObjectId {}

src/MongoDB/Monitoring/TopologyOpeningEvent_arginfo.h

@@ -355,10 +355,9 @@ static void phongo_apm_topology_closed(const mongoc_apm_topology_closed_t* event
 
 static void phongo_apm_topology_opening(const mongoc_apm_topology_opening_t* event)
 {
-	mongoc_client_t*               client;
-	HashTable*                     subscribers;
-	phongo_topologyopeningevent_t* p_event;
-	zval                           z_event;
+	mongoc_client_t* client;
+	HashTable*       subscribers;
+	zval             z_event;
 
 	client      = mongoc_apm_topology_opening_get_context(event);
 	subscribers = phongo_apm_get_subscribers_to_notify(phongo_sdamsubscriber_ce, client);
@@ -368,11 +367,7 @@ static void phongo_apm_topology_opening(const mongoc_apm_topology_opening_t* eve
 		goto cleanup;
 	}
 
-	object_init_ex(&z_event, phongo_topologyopeningevent_ce);
-	p_event = Z_TOPOLOGYOPENINGEVENT_OBJ_P(&z_event);
-
-	mongoc_apm_topology_opening_get_topology_id(event, &p_event->topology_id);
-
+	phongo_topologyopeningevent_init(&z_event, event);
 	phongo_apm_dispatch_event(subscribers, "topologyOpening", &z_event);
 	zval_ptr_dtor(&z_event);
 

src/phongo_apm.c

@@ -36,5 +36,6 @@ void phongo_serverheartbeatsucceededevent_init(zval* return_value, const mongoc_
 void phongo_serveropeningevent_init(zval* return_value, const mongoc_apm_server_opening_t* event);
 void phongo_topologychangedevent_init(zval* return_value, const mongoc_apm_topology_changed_t* event);
 void phongo_topologyclosedevent_init(zval* return_value, const mongoc_apm_topology_closed_t* event);
+void phongo_topologyopeningevent_init(zval* return_value, const mongoc_apm_topology_opening_t* event);
 
 #endif /* PHONGO_APM_H */

src/phongo_apm.h

@@ -28,6 +28,7 @@ class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
     public function topologyOpening(MongoDB\Driver\Monitoring\TopologyOpeningEvent $event): void
     {
         printf("getTopologyId() returns an ObjectId: %s\n", ($event->getTopologyId() instanceof MongoDB\BSON\ObjectId) ? 'yes' : 'no');
+        printf("topologyId returns an ObjectId: %s\n", ($event->topologyId instanceof MongoDB\BSON\ObjectId) ? 'yes' : 'no');
 
         var_dump($event);
     }
@@ -44,6 +45,7 @@ $m->executeCommand(DATABASE_NAME, $command);
 <?php exit(0); ?>
 --EXPECTF--
 getTopologyId() returns an ObjectId: yes
+topologyId returns an ObjectId: yes
 object(MongoDB\Driver\Monitoring\TopologyOpeningEvent)#%d (%d) {
   ["topologyId"]=>
   object(MongoDB\BSON\ObjectId)#%d (%d) {