Changeset 53271

Timestamp:

04/26/2022 11:29:49 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-image-editor.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::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], [53270].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.

File:

• trunk/src/wp-includes/class-wp-image-editor.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-image-editor.php

@@ -550 +550 @@
      *
      * @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 ) {
         $stream = wp_is_stream( $filename );
         if ( $stream ) {
@@ -563 +563 @@
         }
 
-        $result = call_user_func_array( $function, $arguments );
+        $result = call_user_func_array( $callback, $arguments );
 
         if ( $result && $stream ) {