Reorder libbson and libmongoc output in phpinfo()

Author: jmikola

php_phongo.c

@@ -1966,19 +1966,22 @@ PHP_MINFO_FUNCTION(mongodb)
 	php_info_print_table_header(2, "MongoDB support", "enabled");
 	php_info_print_table_row(2, "MongoDB extension version", MONGODB_VERSION_S);
 	php_info_print_table_row(2, "MongoDB extension stability", MONGODB_STABILITY_S);
+
+#ifdef HAVE_SYSTEM_LIBBSON
+	php_info_print_table_row(2, "libbson headers version", BSON_VERSION_S);
+	php_info_print_table_row(2, "libbson library version", bson_get_version());
+#else
+	php_info_print_table_row(2, "libbson bundled version", BSON_VERSION_S);
+#endif
+
 #ifdef HAVE_SYSTEM_LIBMONGOC
 	php_info_print_table_row(2, "libmongoc headers version", MONGOC_VERSION_S);
 	php_info_print_table_row(2, "libmongoc library version", mongoc_get_version());
 #else
 	/* Bundled libraries, buildtime = runtime */
 	php_info_print_table_row(2, "libmongoc bundled version", MONGOC_VERSION_S);
 #endif
-#ifdef HAVE_SYSTEM_LIBBSON
-	php_info_print_table_row(2, "libbson headers version", BSON_VERSION_S);
-	php_info_print_table_row(2, "libbson library version", bson_get_version());
-#else
-	php_info_print_table_row(2, "libbson bundled version", BSON_VERSION_S);
-#endif
+
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();

tests/functional/phpinfo-1.phpt

@@ -19,8 +19,8 @@ mongodb
 MongoDB support => enabled
 MongoDB extension version => 1.%d.%d%S
 MongoDB extension stability => %s
-libmongoc bundled version => 1.%s
-libbson bundled version => 1.%s
+libbson bundled version => 1.%d.%d%S
+libmongoc bundled version => 1.%d.%d%S
 
 Directive => Local Value => Master Value
 mongodb.debug => no value => no value

tests/functional/phpinfo-2.phpt

@@ -22,8 +22,8 @@ mongodb
 MongoDB support => enabled
 MongoDB extension version => 1.%d.%d%S
 MongoDB extension stability => %s
-libmongoc bundled version => 1.%s
-libbson bundled version => 1.%s
+libbson bundled version => 1.%d.%d%S
+libmongoc bundled version => 1.%d.%d%S
 
 Directive => Local Value => Master Value
 mongodb.debug => stdout => stderr