Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Postpone zend_array_sort() in ext-intl Use bool for zend_array_sort()
iluuu1994 · Nov 4, 2024 · 085c151 · 085c151
2 parents 230defc + 7456842
commit 085c151
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -309,7 +309,7 @@ static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucke
 /* Use this variant over zend_hash_sort() when sorting user arrays that may
  * trigger user code. It will ensure the user code cannot free the array during
  * sorting. */
-static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, zend_bool renumber) {
+static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
 	zend_array_sort_ex(ht, zend_sort, compare_func, renumber);
 }
 

diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c
@@ -292,7 +292,7 @@ static void collator_sort_internal( int renumber, INTERNAL_FUNCTION_PARAMETERS )
 	INTL_G( current_collator ) = co->ucoll;
 
 	/* Sort specified array. */
-	zend_array_sort(hash, collator_compare_func, renumber);
+	zend_hash_sort(hash, collator_compare_func, renumber);
 
 	/* Restore saved collator. */
 	INTL_G( current_collator ) = saved_collator;