archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  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:31 +01:00
commit 085c151481
No known key found for this signature in database
GPG key ID: 5050C66BFCD1015A
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;