From 98fd38f44f0ef30fd136ec24aef6775f0503e3ff Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 15 Dec 2022 11:01:34 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/rewrite.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 `add_feed()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@54996 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/rewrite.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/rewrite.php b/src/wp-includes/rewrite.php index 477a85fbef..4c92a4293c 100644 --- a/src/wp-includes/rewrite.php +++ b/src/wp-includes/rewrite.php @@ -244,10 +244,10 @@ function remove_permastruct( $name ) { * @global WP_Rewrite $wp_rewrite WordPress rewrite component. * * @param string $feedname Feed name. - * @param callable $function Callback to run on feed display. + * @param callable $callback Callback to run on feed display. * @return string Feed action name. */ -function add_feed( $feedname, $function ) { +function add_feed( $feedname, $callback ) { global $wp_rewrite; if ( ! in_array( $feedname, $wp_rewrite->feeds, true ) ) { @@ -259,7 +259,7 @@ function add_feed( $feedname, $function ) { // Remove default function hook. remove_action( $hook, $hook ); - add_action( $hook, $function, 10, 2 ); + add_action( $hook, $callback, 10, 2 ); return $hook; }