Make WordPress Core

Changeset 55127


Ignore:
Timestamp:
01/24/2023 03:35:59 PM (18 months ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-theme-json-resolver.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 $array parameter to $input_array in WP_Theme_JSON_Resolver::remove_json_comments().

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], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049], [55050], [55060], [55062], [55064], [55065], [55076], [55077], [55078], [55081], [55090], [55100], [55104], [55112], [55115], [55116], [55117], [55119], [55120], [55126].

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-theme-json-resolver.php

    r55086 r55127  
    374374     * When given an array, this will remove any keys with the name `//`.
    375375     *
    376      * @param array $array The array to filter.
     376     * @param array $input_array The array to filter.
    377377     * @return array The filtered array.
    378378     */
    379     private static function remove_json_comments( $array ) {
    380         unset( $array['//'] );
    381         foreach ( $array as $k => $v ) {
     379    private static function remove_json_comments( $input_array ) {
     380        unset( $input_array['//'] );
     381        foreach ( $input_array as $k => $v ) {
    382382            if ( is_array( $v ) ) {
    383                 $array[ $k ] = static::remove_json_comments( $v );
    384             }
    385         }
    386 
    387         return $array;
     383                $input_array[ $k ] = static::remove_json_comments( $v );
     384            }
     385        }
     386
     387        return $input_array;
    388388    }
    389389
Note: See TracChangeset for help on using the changeset viewer.