From 8ef9e78699b1a0da298eaa24113368c44edb7652 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 26 Apr 2022 11:23:59 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-image-editor-gd.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 `WP_Image_Editor_GD::make_image()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. git-svn-id: https://develop.svn.wordpress.org/trunk@53270 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-image-editor-gd.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php index 80e58f77cf..a6dcf1ca12 100644 --- a/src/wp-includes/class-wp-image-editor-gd.php +++ b/src/wp-includes/class-wp-image-editor-gd.php @@ -537,15 +537,15 @@ class WP_Image_Editor_GD extends WP_Image_Editor { * @since 3.5.0 * * @param string $filename - * @param callable $function + * @param callable $callback * @param array $arguments * @return bool */ - protected function make_image( $filename, $function, $arguments ) { + protected function make_image( $filename, $callback, $arguments ) { if ( wp_is_stream( $filename ) ) { $arguments[1] = null; } - return parent::make_image( $filename, $function, $arguments ); + return parent::make_image( $filename, $callback, $arguments ); } }