PHPC-1985: Report unset round_trip_time as null in Server debug output (#1265)

jmikola · web-flow · commit f9fe7efe030e · 2021-10-15T15:32:45.000-04:00
diff --git a/php_phongo.c b/php_phongo.c
@@ -1223,7 +1223,12 @@ bool php_phongo_server_to_zval(zval* retval, mongoc_client_t* client, mongoc_ser
 		ADD_ASSOC_ZVAL_EX(retval, "last_hello_response", &state.zchild);
 	}
 
-	ADD_ASSOC_LONG_EX(retval, "round_trip_time", (zend_long) mongoc_server_description_round_trip_time(sd));
+	/* TODO: Use MONGOC_RTT_UNSET once it is added to libmongoc's public API (CDRIVER-4176) */
+	if (mongoc_server_description_round_trip_time(sd) == -1) {
+		ADD_ASSOC_NULL_EX(retval, "round_trip_time");
+	} else {
+		ADD_ASSOC_LONG_EX(retval, "round_trip_time", (zend_long) mongoc_server_description_round_trip_time(sd));
+	}
 
 	return true;
 } /* }}} */
diff --git a/tests/server/server-debug.phpt b/tests/server/server-debug.phpt
@@ -38,6 +38,6 @@ object(MongoDB\Driver\Server)#%d (%d) {
     %a
   }
   ["round_trip_time"]=>
-  int(%i)
+  %r(NULL|int\(\d+\))%r
 }
 ===DONE===

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ object(MongoDB\Driver\Server)#%d (%d) {`
`38`	`38`	`%a`
`39`	`39`	`}`
`40`	`40`	`["round_trip_time"]=>`
`41`		`- int(%i)`
	`41`	`+ %r(NULL\|int\(\d+\))%r`
`42`	`42`	`}`
`43`	`43`	`===DONE===`