Make WordPress Core


Ignore:
Timestamp:
09/08/2021 03:35:32 PM (3 years ago)
Author:
hellofromTonya
Message:

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

In the parent class, renames the parameter $object to $data_object.

Why? object is a PHP reserved keyword.

In each child class: renames the corresponding 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.
  • 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, 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].

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

File:
1 edited

Legend:

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

    r50823 r51739  
    9494     * @see Walker::start_el()
    9595     * @since 2.1.0
     96     * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
    9697     *
    9798     * @param string  $output       Used to append additional content. Passed by reference.
    98      * @param WP_Post $page         Page data object.
     99     * @param WP_Post $data_object  Page data object.
    99100     * @param int     $depth        Optional. Depth of page. Used for padding. Default 0.
    100101     * @param array   $args         Optional. Array of arguments. Default empty array.
    101102     * @param int     $current_page Optional. Page ID. Default 0.
    102103     */
    103     public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
     104    public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
     105        // Restores the more descriptive, specific name for use within this method.
     106        $page = $data_object;
     107
    104108        if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
    105109            $t = "\t";
Note: See TracChangeset for help on using the changeset viewer.