Make WordPress Core


Ignore:
Timestamp:
01/17/2023 02:05:38 PM (11 months ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in phpunit/tests/hooks/addFilter.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 $string parameter to $value in:

  • Tests_Hooks_AddFilter::_filter_remove_and_add1()
  • Tests_Hooks_AddFilter::_filter_remove_and_add2()
  • Tests_Hooks_AddFilter::_filter_remove_and_recurse_and_add2()
  • Tests_Hooks_AddFilter::_filter_remove_and_add3()
  • Tests_Hooks_AddFilter::_filter_remove_and_add4()

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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/hooks/addFilter.php

    r53942 r55081  
    11<?php
    2 
    32
    43/**
     
    190189    }
    191190
    192     public function _filter_remove_and_add1( $string ) {
    193         return $string . '1';
    194     }
    195 
    196     public function _filter_remove_and_add2( $string ) {
     191    public function _filter_remove_and_add1( $value ) {
     192        return $value . '1';
     193    }
     194
     195    public function _filter_remove_and_add2( $value ) {
    197196        $this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11 );
    198197        $this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11, 1 );
    199198
    200         return $string . '2';
    201     }
    202 
    203     public function _filter_remove_and_recurse_and_add2( $string ) {
     199        return $value . '2';
     200    }
     201
     202    public function _filter_remove_and_recurse_and_add2( $value ) {
    204203        $this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11 );
    205204
    206         $string .= '-' . $this->hook->apply_filters( '', array() ) . '-';
     205        $value .= '-' . $this->hook->apply_filters( '', array() ) . '-';
    207206
    208207        $this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11, 1 );
    209208
    210         return $string . '2';
    211     }
    212 
    213     public function _filter_remove_and_add3( $string ) {
    214         return $string . '3';
    215     }
    216 
    217     public function _filter_remove_and_add4( $string ) {
    218         return $string . '4';
     209        return $value . '2';
     210    }
     211
     212    public function _filter_remove_and_add3( $value ) {
     213        return $value . '3';
     214    }
     215
     216    public function _filter_remove_and_add4( $value ) {
     217        return $value . '4';
    219218    }
    220219
Note: See TracChangeset for help on using the changeset viewer.