Make WordPress Core


Ignore:
Timestamp:
09/09/2021 12:38:36 PM (3 years ago)
Author:
hellofromTonya
Message:

Code Modernization: Fix last parameter name mismatches for parent/child classes in Walker::start_el().

The parent class uses $current_object_id while most of the child classes use $id. As the parent class' is more descriptive, renaming the last parameter in each of child class.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

  • @since clearly specifies the original parameter name and its new name as well as why the change happened.
  • In methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.
  • In cases where the original parameter name was too generic or misleading, renamed (when reassigning) to a more descriptive name for use within the method.

Follow-up to [7737], [8900], [8970], [14248], [15077], [16100], [25642], [25644], [37051], [37054], [37056], [46271], [47189], [51739].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php

    r51739 r51779  
    4747     * @see Walker_Nav_Menu::start_el()
    4848     * @since 3.0.0
    49      * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
     49     * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
     50     *              to match parent class for PHP 8 named parameter support.
    5051     *
    5152     * @global int $_wp_nav_menu_max_depth
    5253     *
    53      * @param string   $output      Used to append additional content (passed by reference).
    54      * @param WP_Post  $data_object Menu item data object.
    55      * @param int      $depth       Depth of menu item. Used for padding.
    56      * @param stdClass $args        Not used.
    57      * @param int      $id          Not used.
     54     * @param string   $output            Used to append additional content (passed by reference).
     55     * @param WP_Post  $data_object       Menu item data object.
     56     * @param int      $depth             Depth of menu item. Used for padding.
     57     * @param stdClass $args              Not used.
     58     * @param int      $current_object_id Optional. ID of the current menu item. Default 0.
    5859     */
    59     public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
     60    public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) {
    6061        global $_wp_nav_menu_max_depth;
    6162
     
    242243                 * @since 5.4.0
    243244                 *
    244                  * @param int      $item_id   Menu item ID.
    245                  * @param WP_Post  $menu_item Menu item data object.
    246                  * @param int      $depth     Depth of menu item. Used for padding.
    247                  * @param stdClass $args      An object of menu item arguments.
    248                  * @param int      $id        Nav menu ID.
     245                 * @param int      $item_id           Menu item ID.
     246                 * @param WP_Post  $menu_item         Menu item data object.
     247                 * @param int      $depth             Depth of menu item. Used for padding.
     248                 * @param stdClass $args              An object of menu item arguments.
     249                 * @param int      $current_object_id Nav menu ID.
    249250                 */
    250                 do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $id );
     251                do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $current_object_id );
    251252                ?>
    252253
Note: See TracChangeset for help on using the changeset viewer.