Commit 0d47d19bf08 for php

commit 0d47d19bf08e9a702deae3c1ec52c1e0e675803a
Author: Gina Peter Banyard <girgias@php.net>
Date:   Fri Oct 23 19:58:39 2026 +0100

    intl: refactor collator

    - Make functions private
    - Drop some header includes
    - Remove old arg info header file

diff --git a/ext/intl/collator/collator.h b/ext/intl/collator/collator.h
index 959da9063e0..75e7bdc0799 100644
--- a/ext/intl/collator/collator.h
+++ b/ext/intl/collator/collator.h
@@ -16,8 +16,6 @@
 #ifndef COLLATOR_COLLATOR_H
 #define COLLATOR_COLLATOR_H

-#include <php.h>
-
 #define COLLATOR_SORT_REGULAR   0
 #define COLLATOR_SORT_STRING    1
 #define COLLATOR_SORT_NUMERIC   2
diff --git a/ext/intl/collator/collator_class.cpp b/ext/intl/collator/collator_class.cpp
index 6e4996d065f..c8920d78212 100644
--- a/ext/intl/collator/collator_class.cpp
+++ b/ext/intl/collator/collator_class.cpp
@@ -34,8 +34,22 @@ static zend_object_handlers Collator_handlers;
  * Auxiliary functions needed by objects of 'Collator' class
  */

-/* {{{ Collator_objects_free */
-void Collator_objects_free(zend_object *object )
+/* Clean up mem allocted by internals of Collator_object */
+static void collator_object_destroy( Collator_object* co )
+{
+	if( !co )
+		return;
+
+	if( co->ucoll )
+	{
+		ucol_close( co->ucoll );
+		co->ucoll = nullptr;
+	}
+
+	intl_error_reset( COLLATOR_ERROR_P( co ) );
+}
+
+static void Collator_objects_free(zend_object *object )
 {
 	Collator_object* co = php_intl_collator_fetch_object(object);

@@ -43,10 +57,9 @@ void Collator_objects_free(zend_object *object )

 	collator_object_destroy(co );
 }
-/* }}} */

 /* {{{ Collator_object_create */
-U_CFUNC zend_object *Collator_object_create(zend_class_entry *ce )
+static zend_object *Collator_object_create(zend_class_entry *ce )
 {
 	Collator_object *intern = reinterpret_cast<Collator_object *>(zend_object_alloc(sizeof(Collator_object), ce));
 	intl_error_init(COLLATOR_ERROR_P(intern));
@@ -82,21 +95,3 @@ U_CFUNC void collator_register_Collator_symbols(int module_number)
 	Collator_handlers.free_obj = Collator_objects_free;
 }
 /* }}} */
-
-/* {{{ void collator_object_destroy( Collator_object* co )
- * Clean up mem allocted by internals of Collator_object
- */
-U_CFUNC void collator_object_destroy( Collator_object* co )
-{
-	if( !co )
-		return;
-
-	if( co->ucoll )
-	{
-		ucol_close( co->ucoll );
-		co->ucoll = nullptr;
-	}
-
-	intl_error_reset( COLLATOR_ERROR_P( co ) );
-}
-/* }}} */
diff --git a/ext/intl/collator/collator_class.h b/ext/intl/collator/collator_class.h
index 84790e88f80..affe588c221 100644
--- a/ext/intl/collator/collator_class.h
+++ b/ext/intl/collator/collator_class.h
@@ -60,7 +60,6 @@ static zend_always_inline zend_result collator_check_initialized(Collator_object
 }
 BEGIN_EXTERN_C()
 void collator_register_Collator_symbols(int module_number);
-void collator_object_destroy( Collator_object* co );

 extern zend_class_entry *Collator_ce_ptr;
 END_EXTERN_C()
diff --git a/ext/intl/collator/collator_functions_arginfo.h b/ext/intl/collator/collator_functions_arginfo.h
deleted file mode 100644
index 4a863d74764..00000000000
Binary files a/ext/intl/collator/collator_functions_arginfo.h and /dev/null differ