Skip to content

Commit dbcdd4e

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Postpone zend_array_sort() in ext-intl Use bool for zend_array_sort()
2 parents ecb87ca + 085c151 commit dbcdd4e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_hash.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucke
309309
/* Use this variant over zend_hash_sort() when sorting user arrays that may
310310
* trigger user code. It will ensure the user code cannot free the array during
311311
* sorting. */
312-
static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, zend_bool renumber) {
312+
static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
313313
zend_array_sort_ex(ht, zend_sort, compare_func, renumber);
314314
}
315315

ext/intl/collator/collator_sort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static void collator_sort_internal( int renumber, INTERNAL_FUNCTION_PARAMETERS )
292292
INTL_G( current_collator ) = co->ucoll;
293293

294294
/* Sort specified array. */
295-
zend_array_sort(hash, collator_compare_func, renumber);
295+
zend_hash_sort(hash, collator_compare_func, renumber);
296296

297297
/* Restore saved collator. */
298298
INTL_G( current_collator ) = saved_collator;

0 commit comments

Comments
 (0)