Make WordPress Core


Ignore:
Timestamp:
01/23/2023 04:33:57 PM (17 months ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in phpunit/tests/shortcode.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 $return parameter to $output in:
    • Tests_Shortcode::filter_pre_do_shortcode_tag_attr()
    • Tests_Shortcode::filter_do_shortcode_tag_replace()
    • Tests_Shortcode::filter_do_shortcode_tag_generate()
    • Tests_Shortcode::filter_do_shortcode_tag_attr()
  • Amends the $return parameter of the pre_do_shortcode_tag filter for consistency.

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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/shortcode.php

    r53948 r55119  
    827827        // Pass arguments.
    828828        $arr = array(
    829             'return' => 'p11',
     829            'output' => 'p11',
    830830            'key'    => $str,
    831831            'atts'   => array(
     
    865865    }
    866866
    867     public function filter_pre_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
     867    public function filter_pre_do_shortcode_tag_attr( $output, $key, $atts, $m ) {
    868868        $arr = array(
    869             'return' => $return,
     869            'output' => $output,
    870870            'key'    => $key,
    871871            'atts'   => $atts,
     
    897897        // Pass arguments.
    898898        $arr = array(
    899             'return' => 'foobar',
     899            'output' => 'foobar',
    900900            'key'    => $str,
    901901            'atts'   => array(
     
    927927    }
    928928
    929     public function filter_do_shortcode_tag_replace( $return ) {
    930         return str_replace( 'oo', 'ee', $return );
    931     }
    932 
    933     public function filter_do_shortcode_tag_generate( $return ) {
     929    public function filter_do_shortcode_tag_replace( $output ) {
     930        return str_replace( 'oo', 'ee', $output );
     931    }
     932
     933    public function filter_do_shortcode_tag_generate( $output ) {
    934934        return 'foobar';
    935935    }
    936936
    937     public function filter_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
     937    public function filter_do_shortcode_tag_attr( $output, $key, $atts, $m ) {
    938938        $arr = array(
    939             'return' => $return,
     939            'output' => $output,
    940940            'key'    => $key,
    941941            'atts'   => $atts,
Note: See TracChangeset for help on using the changeset viewer.