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

ext/spl: Refactor ArrayObject sort methods

Browse Source
This commit is contained in:
Gina Peter Banyard
2025-07-03 15:20:35 +01:00
parent faef004250
commit 50ddf6a68f
8 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ext/spl/spl_array.c
View File

@@ -1203,43 +1203,54 @@ PHP_METHOD(ArrayObject, count)
RETURN_LONG(spl_array_object_count_elements_helper(intern));
} /* }}} */
static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, size_t fname_len, int use_arg) /* {{{ */
enum spl_array_object_sort_methods {
SPL_NAT_SORT,
SPL_CALLBACK_SORT,
SPL_OPTIONAL_FLAG_SORT
};
static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, const char *fname, size_t fname_len, enum spl_array_object_sort_methods use_arg) /* {{{ */
{
spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS);
HashTable **ht_ptr = spl_array_get_hash_table_ptr(intern);
HashTable *aht = *ht_ptr;
zval function_name, params[2], *arg = NULL;
zval params[2], *arg = NULL;
ZVAL_STRINGL(&function_name, fname, fname_len);
zend_function *fn = zend_hash_str_find_ptr(EG(function_table), fname, fname_len);
if (UNEXPECTED(fn == NULL)) {
zend_throw_error(NULL, "Cannot call method %s when function %s is disabled", fname, fname);
RETURN_THROWS();
}
ZVAL_NEW_EMPTY_REF(&params[0]);
ZVAL_ARR(Z_REFVAL(params[0]), aht);
GC_ADDREF(aht);
if (!use_arg) {
if (use_arg == SPL_NAT_SORT) {
if (zend_parse_parameters_none() == FAILURE) {
goto exit;
}
intern->nApplyCount++;
call_user_function(EG(function_table), NULL, &function_name, return_value, 1, params);
zend_call_known_function(fn, NULL, NULL, return_value, 1, params, NULL);
intern->nApplyCount--;
} else if (use_arg == SPL_ARRAY_METHOD_SORT_FLAGS_ARG) {
} else if (use_arg == SPL_OPTIONAL_FLAG_SORT) {
zend_long sort_flags = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &sort_flags) == FAILURE) {
goto exit;
}
ZVAL_LONG(&params[1], sort_flags);
intern->nApplyCount++;
call_user_function(EG(function_table), NULL, &function_name, return_value, 2, params);
zend_call_known_function(fn, NULL, NULL, return_value, 2, params, NULL);
intern->nApplyCount--;
} else {
ZEND_ASSERT(use_arg == SPL_CALLBACK_SORT);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &arg) == FAILURE) {
goto exit;
}
ZVAL_COPY_VALUE(&params[1], arg);
intern->nApplyCount++;
call_user_function(EG(function_table), NULL, &function_name, return_value, 2, params);
zend_call_known_function(fn, NULL, NULL, return_value, 2, params, NULL);
intern->nApplyCount--;
}
@@ -1251,7 +1262,6 @@ exit:
*ht_ptr = Z_ARRVAL_P(ht_zv);
ZVAL_NULL(ht_zv);
zval_ptr_dtor(&params[0]);
zend_string_free(Z_STR(function_name));
}
} /* }}} */
@@ -1261,23 +1271,23 @@ PHP_METHOD(cname, fname) \
spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname, sizeof(#fname)-1, use_arg); \
}
/* {{{ Sort the entries by values. */
SPL_ARRAY_METHOD(ArrayObject, asort, SPL_ARRAY_METHOD_SORT_FLAGS_ARG) /* }}} */
/* Sort the entries by values. */
SPL_ARRAY_METHOD(ArrayObject, asort, SPL_OPTIONAL_FLAG_SORT)
/* {{{ Sort the entries by key. */
SPL_ARRAY_METHOD(ArrayObject, ksort, SPL_ARRAY_METHOD_SORT_FLAGS_ARG) /* }}} */
/* Sort the entries by key. */
SPL_ARRAY_METHOD(ArrayObject, ksort, SPL_OPTIONAL_FLAG_SORT)
/* {{{ Sort the entries by values user defined function. */
SPL_ARRAY_METHOD(ArrayObject, uasort, SPL_ARRAY_METHOD_CALLBACK_ARG) /* }}} */
/* Sort the entries by values user defined function. */
SPL_ARRAY_METHOD(ArrayObject, uasort, SPL_CALLBACK_SORT)
/* {{{ Sort the entries by key using user defined function. */
SPL_ARRAY_METHOD(ArrayObject, uksort, SPL_ARRAY_METHOD_CALLBACK_ARG) /* }}} */
/* Sort the entries by key using user defined function. */
SPL_ARRAY_METHOD(ArrayObject, uksort, SPL_CALLBACK_SORT)
/* {{{ Sort the entries by values using "natural order" algorithm. */
SPL_ARRAY_METHOD(ArrayObject, natsort, SPL_ARRAY_METHOD_NO_ARG) /* }}} */
/* Sort the entries by values using "natural order" algorithm. */
SPL_ARRAY_METHOD(ArrayObject, natsort, SPL_NAT_SORT)
/* {{{ Sort the entries by key using case insensitive "natural order" algorithm. */
SPL_ARRAY_METHOD(ArrayObject, natcasesort, SPL_ARRAY_METHOD_NO_ARG) /* }}} */
/* {{{ Sort the entries by key using case-insensitive "natural order" algorithm. */
SPL_ARRAY_METHOD(ArrayObject, natcasesort, SPL_NAT_SORT)
/* {{{ Serialize the object */
PHP_METHOD(ArrayObject, serialize)

4
ext/spl/spl_array.h
View File

@@ -27,10 +27,6 @@
#define SPL_ARRAY_INT_MASK 0xFFFF0000
#define SPL_ARRAY_CLONE_MASK 0x0100FFFF
#define SPL_ARRAY_METHOD_NO_ARG 0
#define SPL_ARRAY_METHOD_CALLBACK_ARG 1
#define SPL_ARRAY_METHOD_SORT_FLAGS_ARG 2
extern PHPAPI zend_class_entry *spl_ce_ArrayObject;
extern PHPAPI zend_class_entry *spl_ce_ArrayIterator;
extern PHPAPI zend_class_entry *spl_ce_RecursiveArrayIterator;

2
ext/spl/tests/ArrayObject/asort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback asort, function "asort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method asort when function asort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->asort()
#1 {main}

2
ext/spl/tests/ArrayObject/ksort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback ksort, function "ksort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method ksort when function ksort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->ksort()
#1 {main}

2
ext/spl/tests/ArrayObject/natcasesort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback natcasesort, function "natcasesort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method natcasesort when function natcasesort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->natcasesort()
#1 {main}

2
ext/spl/tests/ArrayObject/natsort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback natsort, function "natsort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method natsort when function natsort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->natsort()
#1 {main}

2
ext/spl/tests/ArrayObject/uasort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback uasort, function "uasort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method uasort when function uasort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->uasort(Object(Closure))
#1 {main}

2
ext/spl/tests/ArrayObject/uksort_disabled.phpt
View File

@@ -11,7 +11,7 @@ var_dump($ao);
?>
--EXPECTF--
Fatal error: Uncaught Error: Invalid callback uksort, function "uksort" not found or invalid function name in %s:%d
Fatal error: Uncaught Error: Cannot call method uksort when function uksort is disabled in %s:%d
Stack trace:
#0 %s(%d): ArrayObject->uksort(Object(Closure))
#1 {main}