php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Postpone zend_array_sort() in ext-intl
  Use bool for zend_array_sort()
This commit is contained in:
Ilija Tovilo
2024-11-04 16:02:47 +01:00
parent ecb87ca5f1 085c151481
commit dbcdd4e4a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_hash.h
View File

@@ -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);
}

2
ext/intl/collator/collator_sort.c
View File

@@ -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;