ext/standard/array.c: refactor sort functions to use shared php_sort helper

- Replace php_array_apply_sort with php_sort that handles parameter parsing
- Consolidate duplicate parameter parsing code across asort, arsort, sort, rsort, krsort, and ksort
- Each sort function now simply calls php_sort with appropriate compare function and renumber flag

Author: jmarble

ext/standard/array.c

@@ -990,111 +990,63 @@ PHP_FUNCTION(natcasesort)
 
 typedef bucket_compare_func_t(*get_compare_function)(zend_long);
 
-static zend_always_inline void php_array_apply_sort(HashTable *array, zend_long sort_type, get_compare_function get_cmp, bool renumber)
-{
-	bucket_compare_func_t cmp = get_cmp(sort_type);
-	zend_array_sort(array, cmp, renumber);
-}
-
-/* {{{ Sort an array and maintain index association */
-PHP_FUNCTION(asort)
-{
+static zend_always_inline void php_sort(INTERNAL_FUNCTION_PARAMETERS, get_compare_function get_cmp, bool renumber) {
 	HashTable *array;
 	zend_long sort_type = PHP_SORT_REGULAR;
+	bucket_compare_func_t cmp;
 
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(sort_type)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_array_apply_sort(array, sort_type, php_get_data_compare_func, false);
+	cmp = get_cmp(sort_type);
+
+	zend_array_sort(array, cmp, renumber);
+
 	RETURN_TRUE;
 }
+
+/* {{{ Sort an array and maintain index association */
+PHP_FUNCTION(asort)
+{
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_data_compare_func, false);
+}
 /* }}} */
 
 /* {{{ Sort an array in reverse order and maintain index association */
 PHP_FUNCTION(arsort)
 {
-	HashTable *array;
-	zend_long sort_type = PHP_SORT_REGULAR;
-
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(sort_type)
-	ZEND_PARSE_PARAMETERS_END();
-
-	php_array_apply_sort(array, sort_type, php_get_data_reverse_compare_func, false);
-	RETURN_TRUE;
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_data_reverse_compare_func, false);
 }
 /* }}} */
 
 /* {{{ Sort an array */
 PHP_FUNCTION(sort)
 {
-	HashTable *array;
-	zend_long sort_type = PHP_SORT_REGULAR;
-
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(sort_type)
-	ZEND_PARSE_PARAMETERS_END();
-
-	php_array_apply_sort(array, sort_type, php_get_data_compare_func, true);
-	RETURN_TRUE;
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_data_compare_func, true);
 }
 /* }}} */
 
 /* {{{ Sort an array in reverse order */
 PHP_FUNCTION(rsort)
 {
-	HashTable *array;
-	zend_long sort_type = PHP_SORT_REGULAR;
-
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(sort_type)
-	ZEND_PARSE_PARAMETERS_END();
-
-	php_array_apply_sort(array, sort_type, php_get_data_reverse_compare_func, true);
-	RETURN_TRUE;
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_data_reverse_compare_func, true);
 }
 /* }}} */
 
 /* {{{ Sort an array by key value in reverse order */
 PHP_FUNCTION(krsort)
 {
-	HashTable *array;
-	zend_long sort_type = PHP_SORT_REGULAR;
-
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(sort_type)
-	ZEND_PARSE_PARAMETERS_END();
-
-	php_array_apply_sort(array, sort_type, php_get_key_reverse_compare_func, false);
-	RETURN_TRUE;
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_key_reverse_compare_func, false);
 }
 /* }}} */
 
 /* {{{ Sort an array by key */
 PHP_FUNCTION(ksort)
 {
-	HashTable *array;
-	zend_long sort_type = PHP_SORT_REGULAR;
-
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_ARRAY_HT_EX(array, 0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(sort_type)
-	ZEND_PARSE_PARAMETERS_END();
-
-	php_array_apply_sort(array, sort_type, php_get_key_compare_func, false);
-	RETURN_TRUE;
+	php_sort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_get_key_compare_func, false);
 }
 /* }}} */