uri: Export the individual object handlers

Author: TimWolla

ext/uri/php_uri.c

@@ -950,7 +950,7 @@ PHP_METHOD(Uri_WhatWg_Url, __debugInfo)
 	RETURN_ARR(uri_get_debug_properties(object));
 }
 
-static uri_object_t *uri_create_object_handler(zend_class_entry *class_type, const uri_parser_t *parser)
+PHPAPI uri_object_t *php_uri_object_create(zend_class_entry *class_type, const uri_parser_t *parser)
 {
 	uri_object_t *uri_object = zend_object_alloc(sizeof(*uri_object), class_type);
 
@@ -965,17 +965,17 @@ static uri_object_t *uri_create_object_handler(zend_class_entry *class_type, con
 	return uri_object;
 }
 
-static zend_object *uri_create_object_handler_rfc3986(zend_class_entry *ce)
+static zend_object *php_uri_object_create_rfc3986(zend_class_entry *ce)
 {
-	return &uri_create_object_handler(ce, &php_uri_parser_rfc3986)->std;
+	return &php_uri_object_create(ce, &php_uri_parser_rfc3986)->std;
 }
 
-static zend_object *uri_create_object_handler_whatwg(zend_class_entry *ce)
+static zend_object *php_uri_object_create_whatwg(zend_class_entry *ce)
 {
-	return &uri_create_object_handler(ce, &php_uri_parser_whatwg)->std;
+	return &php_uri_object_create(ce, &php_uri_parser_whatwg)->std;
 }
 
-static void uri_free_obj_handler(zend_object *object)
+PHPAPI void php_uri_object_handler_free(zend_object *object)
 {
 	uri_object_t *uri_object = uri_object_from_obj(object);
 
@@ -988,7 +988,7 @@ static void uri_free_obj_handler(zend_object *object)
 	zend_object_std_dtor(&uri_object->std);
 }
 
-static zend_object *uri_clone_obj_handler(zend_object *object)
+PHPAPI zend_object *php_uri_object_handler_clone(zend_object *object)
 {
 	uri_object_t *uri_object = uri_object_from_obj(object);
 	uri_internal_t *internal_uri = uri_internal_from_obj(object);
@@ -1028,20 +1028,20 @@ PHPAPI zend_result php_uri_parser_register(const uri_parser_t *uri_parser)
 static PHP_MINIT_FUNCTION(uri)
 {
 	uri_rfc3986_uri_ce = register_class_Uri_Rfc3986_Uri();
-	uri_rfc3986_uri_ce->create_object = uri_create_object_handler_rfc3986;
+	uri_rfc3986_uri_ce->create_object = php_uri_object_create_rfc3986;
 	uri_rfc3986_uri_ce->default_object_handlers = &uri_rfc3986_uri_object_handlers;
 	memcpy(&uri_rfc3986_uri_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	uri_rfc3986_uri_object_handlers.offset = XtOffsetOf(uri_object_t, std);
-	uri_rfc3986_uri_object_handlers.free_obj = uri_free_obj_handler;
-	uri_rfc3986_uri_object_handlers.clone_obj = uri_clone_obj_handler;
+	uri_rfc3986_uri_object_handlers.free_obj = php_uri_object_handler_free;
+	uri_rfc3986_uri_object_handlers.clone_obj = php_uri_object_handler_clone;
 
 	uri_whatwg_url_ce = register_class_Uri_WhatWg_Url();
-	uri_whatwg_url_ce->create_object = uri_create_object_handler_whatwg;
+	uri_whatwg_url_ce->create_object = php_uri_object_create_whatwg;
 	uri_whatwg_url_ce->default_object_handlers = &uri_whatwg_uri_object_handlers;
 	memcpy(&uri_whatwg_uri_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	uri_whatwg_uri_object_handlers.offset = XtOffsetOf(uri_object_t, std);
-	uri_whatwg_uri_object_handlers.free_obj = uri_free_obj_handler;
-	uri_whatwg_uri_object_handlers.clone_obj = uri_clone_obj_handler;
+	uri_whatwg_uri_object_handlers.free_obj = php_uri_object_handler_free;
+	uri_whatwg_uri_object_handlers.clone_obj = php_uri_object_handler_clone;
 
 	uri_comparison_mode_ce = register_class_Uri_UriComparisonMode();
 	uri_exception_ce = register_class_Uri_UriException(zend_ce_exception);

ext/uri/php_uri_common.h

@@ -159,6 +159,10 @@ static inline uri_internal_t *uri_internal_from_obj(const zend_object *object) {
 #define Z_URI_OBJECT_P(zv) uri_object_from_obj(Z_OBJ_P((zv)))
 #define Z_URI_INTERNAL_P(zv) uri_internal_from_obj(Z_OBJ_P((zv)))
 
+PHPAPI uri_object_t *php_uri_object_create(zend_class_entry *class_type, const uri_parser_t *parser);
+PHPAPI void php_uri_object_handler_free(zend_object *object);
+PHPAPI zend_object *php_uri_object_handler_clone(zend_object *object);
+
 #define PHP_URI_PARSER_RFC3986 "Uri\\Rfc3986\\Uri"
 #define PHP_URI_PARSER_WHATWG "Uri\\WhatWg\\Url"
 #define PHP_URI_PARSER_PHP_PARSE_URL "parse_url"