Changeset 55081

Timestamp:

01/17/2023 02:05:38 PM (2 years 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:

• trunk/tests/phpunit/tests/hooks/addFilter.php (modified) (2 diffs)

trunk/tests/phpunit/tests/hooks/addFilter.php

@@ -1 +1 @@
 <?php
-
 
 /**
@@ -190 +189 @@
     }
 
-    public function _filter_remove_and_add1( $string ) {
-        return $string . '1';
-    }
-
-    public function _filter_remove_and_add2( $string ) {
+    public function _filter_remove_and_add1( $value ) {
+        return $value . '1';
+    }
+
+    public function _filter_remove_and_add2( $value ) {
         $this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11 );
         $this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11, 1 );
 
-        return $string . '2';
-    }
-
-    public function _filter_remove_and_recurse_and_add2( $string ) {
+        return $value . '2';
+    }
+
+    public function _filter_remove_and_recurse_and_add2( $value ) {
         $this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11 );
 
-        $string .= '-' . $this->hook->apply_filters( '', array() ) . '-';
+        $value .= '-' . $this->hook->apply_filters( '', array() ) . '-';
 
         $this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11, 1 );
 
-        return $string . '2';
-    }
-
-    public function _filter_remove_and_add3( $string ) {
-        return $string . '3';
-    }
-
-    public function _filter_remove_and_add4( $string ) {
-        return $string . '4';
+        return $value . '2';
+    }
+
+    public function _filter_remove_and_add3( $value ) {
+        return $value . '3';
+    }
+
+    public function _filter_remove_and_add4( $value ) {
+        return $value . '4';
     }