Skip to content

Commit 7456842

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Postpone zend_array_sort() in ext-intl Use bool for zend_array_sort()
2 parents f033cf7 + 845cdbc commit 7456842

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucke
306306
/* Use this variant over zend_hash_sort() when sorting user arrays that may
307307
* trigger user code. It will ensure the user code cannot free the array during
308308
* sorting. */
309-
static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, zend_bool renumber) {
309+
static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
310310
zend_array_sort_ex(ht, zend_sort, compare_func, renumber);
311311
}
312312

ext/intl/collator/collator_sort.c

Lines changed: 1 addition & 1 deletion
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)