From c999e7ee37a51183fd7c51abbb6d3b5356b86f36 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 31 Dec 2022 01:15:42 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `phpunit/includes/functions.php`. While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit renames the `$function` parameter to `$callback` in `_test_filter_build_unique_id()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@55023 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/includes/functions.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index 3845f930a5..71bedc7893 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -71,29 +71,29 @@ function tests_add_filter( $tag, $function_to_add, $priority = 10, $accepted_arg * @see _wp_filter_build_unique_id() * * @param string $tag Unused. The name of the filter to build ID for. - * @param callable $function The function to generate ID for. + * @param callable $callback The function to generate ID for. * @param int $priority Unused. The order in which the functions * associated with a particular action are executed. * @return string Unique function ID for usage as array key. */ -function _test_filter_build_unique_id( $tag, $function, $priority ) { - if ( is_string( $function ) ) { - return $function; +function _test_filter_build_unique_id( $tag, $callback, $priority ) { + if ( is_string( $callback ) ) { + return $callback; } - if ( is_object( $function ) ) { + if ( is_object( $callback ) ) { // Closures are currently implemented as objects. - $function = array( $function, '' ); + $callback = array( $callback, '' ); } else { - $function = (array) $function; + $callback = (array) $callback; } - if ( is_object( $function[0] ) ) { + if ( is_object( $callback[0] ) ) { // Object class calling. - return spl_object_hash( $function[0] ) . $function[1]; - } elseif ( is_string( $function[0] ) ) { + return spl_object_hash( $callback[0] ) . $callback[1]; + } elseif ( is_string( $callback[0] ) ) { // Static calling. - return $function[0] . '::' . $function[1]; + return $callback[0] . '::' . $callback[1]; } }