From 4a1789cc34c58e045140020e5cc283d6e6789ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Thu, 21 Aug 2025 23:12:45 +0200
Subject: [PATCH] uri: Use PHP_RINIT/SHUTDOWN_FUNCTION in uri_parser_whatwg
 (#19541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This improves discoverability of this kind of “lifecycle” helper function.
---
 ext/uri/php_uri.c           | 6 ++++--
 ext/uri/uri_parser_whatwg.c | 6 ++++--
 ext/uri/uri_parser_whatwg.h | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ext/uri/php_uri.c b/ext/uri/php_uri.c
index 595caafa5ac..d6fbac50c78 100644
--- a/ext/uri/php_uri.c
+++ b/ext/uri/php_uri.c
@@ -1077,7 +1077,7 @@ static PHP_MSHUTDOWN_FUNCTION(uri)
 
 PHP_RINIT_FUNCTION(uri)
 {
-	if (lexbor_request_init() == FAILURE) {
+	if (PHP_RINIT(uri_parser_whatwg)(INIT_FUNC_ARGS_PASSTHRU) == FAILURE) {
 		return FAILURE;
 	}
 
@@ -1086,7 +1086,9 @@ PHP_RINIT_FUNCTION(uri)
 
 PHP_RSHUTDOWN_FUNCTION(uri)
 {
-	lexbor_request_shutdown();
+	if (PHP_RSHUTDOWN(uri_parser_whatwg)(INIT_FUNC_ARGS_PASSTHRU) == FAILURE) {
+		return FAILURE;
+	}
 
 	return SUCCESS;
 }
diff --git a/ext/uri/uri_parser_whatwg.c b/ext/uri/uri_parser_whatwg.c
index d21b71c2734..4755650bd38 100644
--- a/ext/uri/uri_parser_whatwg.c
+++ b/ext/uri/uri_parser_whatwg.c
@@ -533,7 +533,7 @@ static zend_result lexbor_write_fragment(struct uri_internal_t *internal_uri, zv
 	return SUCCESS;
 }
 
-zend_result lexbor_request_init(void)
+PHP_RINIT_FUNCTION(uri_parser_whatwg)
 {
 	lexbor_mraw_t *mraw = lexbor_mraw_create();
 	lxb_status_t status = lexbor_mraw_init(mraw, LEXBOR_MRAW_BYTE_SIZE);
@@ -554,12 +554,14 @@ zend_result lexbor_request_init(void)
 	return SUCCESS;
 }
 
-void lexbor_request_shutdown(void)
+PHP_RSHUTDOWN_FUNCTION(uri_parser_whatwg)
 {
 	lxb_url_parser_memory_destroy(&lexbor_parser);
 	lxb_url_parser_destroy(&lexbor_parser, false);
 
 	lexbor_urls = 0;
+
+	return SUCCESS;
 }
 
 lxb_url_t *lexbor_parse_uri_ex(const char *uri_str, size_t uri_str_len, const lxb_url_t *lexbor_base_url, zval *errors, bool silent)
diff --git a/ext/uri/uri_parser_whatwg.h b/ext/uri/uri_parser_whatwg.h
index 2727ff4a3ec..c52998a725b 100644
--- a/ext/uri/uri_parser_whatwg.h
+++ b/ext/uri/uri_parser_whatwg.h
@@ -24,7 +24,7 @@ extern const uri_parser_t lexbor_uri_parser;
 
 lxb_url_t *lexbor_parse_uri_ex(const char *uri_str, size_t uri_str_len, const lxb_url_t *lexbor_base_url, zval *errors, bool silent);
 
-zend_result lexbor_request_init(void);
-void lexbor_request_shutdown(void);
+PHP_RINIT_FUNCTION(uri_parser_whatwg);
+PHP_RSHUTDOWN_FUNCTION(uri_parser_whatwg);
 
 #endif