Make WordPress Core


Ignore:
Timestamp:
09/09/2021 01:02:46 PM (3 years ago)
Author:
hellofromTonya
Message:

Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in Walker::end_el().

In the parent class, renames the parameter $object to $data_object.
Why? object is a PHP reserved keyword. The parameter name is selected for consistency with Walker::start_el().

In each child class: renames the parameter to match the parent's method signature.
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.

Follow-up to [7737], [8900], [8970], [14248], [16100], [25642], [25644], [37051], [37056].

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-walker.php

    r51779 r51780  
    101101     *
    102102     * @since 2.1.0
     103     * @since 5.9.0 Renamed `$object` (a PHP reserved keyword) to `$data_object` for PHP 8 named parameter support.
    103104     * @abstract
    104105     *
    105      * @param string $output Used to append additional content (passed by reference).
    106      * @param object $object The data object.
    107      * @param int    $depth  Depth of the item.
    108      * @param array  $args   An array of additional arguments.
    109      */
    110     public function end_el( &$output, $object, $depth = 0, $args = array() ) {}
     106     * @param string $output      Used to append additional content (passed by reference).
     107     * @param object $data_object The data object.
     108     * @param int    $depth       Depth of the item.
     109     * @param array  $args        An array of additional arguments.
     110     */
     111    public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {}
    111112
    112113    /**
Note: See TracChangeset for help on using the changeset viewer.