Changeset 53243

Timestamp:

04/22/2022 10:41:59 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in wp_die_*_handler filters.

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_die_*_handler filters, which aims to make it easier to use a non-reserved parameter name for anyone utilizing these filters.

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].

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

File:

• trunk/src/wp-includes/functions.php (modified) (6 diffs)

trunk/src/wp-includes/functions.php

@@ -3657 +3657 @@
          * @since 3.4.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
+        $callback = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
     } elseif ( wp_is_json_request() ) {
         /**
@@ -3666 +3666 @@
          * @since 5.1.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
+        $callback = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
     } elseif ( defined( 'REST_REQUEST' ) && REST_REQUEST && wp_is_jsonp_request() ) {
         /**
@@ -3675 +3675 @@
          * @since 5.2.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_jsonp_handler', '_jsonp_wp_die_handler' );
+        $callback = apply_filters( 'wp_die_jsonp_handler', '_jsonp_wp_die_handler' );
     } elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
         /**
@@ -3684 +3684 @@
          * @since 3.4.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+        $callback = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
     } elseif ( wp_is_xml_request()
         || isset( $wp_query ) &&
@@ -3697 +3697 @@
          * @since 5.2.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_xml_handler', '_xml_wp_die_handler' );
+        $callback = apply_filters( 'wp_die_xml_handler', '_xml_wp_die_handler' );
     } else {
         /**
@@ -3706 +3706 @@
          * @since 3.0.0
          *
-         * @param callable $function Callback function name.
+         * @param callable $callback Callback function name.
          */
-        $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
-    }
-
-    call_user_func( $function, $message, $title, $args );
+        $callback = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
+    }
+
+    call_user_func( $callback, $message, $title, $args );
 }