Changeset 55039

Timestamp:

01/09/2023 04:38:34 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in phpunit/tests/customize/manager.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 $class parameter to $setting_class in:
  • Tests_WP_Customize_Manager::return_dynamic_customize_setting_class()
  • Tests_WP_Customize_Manager::return_dynamic_customize_setting_args()
• Amends the $args and $id parameters in both methods for consistency.
• Corrects the DocBlock for ::return_dynamic_customize_setting_args().

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

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

File:

• trunk/tests/phpunit/tests/customize/manager.php (modified) (1 diff)

trunk/tests/phpunit/tests/customize/manager.php

@@ -3352 +3352 @@
 
     /**
-     * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
-     *
-     * @param string $class Setting class.
-     * @param array  $args  Setting args.
-     * @param string $id    Setting ID.
-     * @return string       Setting class.
-     */
-    public function return_dynamic_customize_setting_class( $class, $id, $args ) {
-        unset( $args );
-        if ( 0 === strpos( $id, 'dynamic' ) ) {
-            $class = 'Test_Dynamic_Customize_Setting';
+     * Returns 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class'.
+     *
+     * @param string $setting_class Setting class.
+     * @param array  $setting_args  Setting args.
+     * @param string $setting_id    Setting ID.
+     * @return string Setting class.
+     */
+    public function return_dynamic_customize_setting_class( $setting_class, $setting_id, $setting_args ) {
+        unset( $setting_args );
+        if ( 0 === strpos( $setting_id, 'dynamic' ) ) {
+            $setting_class = 'Test_Dynamic_Customize_Setting';
         }
-        return $class;
-    }
-
-    /**
-     * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
-     *
-     * @param array  $args Setting args.
-     * @param string $id   Setting ID.
-     * @return string      Setting args.
-     */
-    public function return_dynamic_customize_setting_args( $args, $id ) {
-        if ( 0 === strpos( $id, 'dynamic' ) ) {
-            $args['custom'] = 'foo';
+        return $setting_class;
+    }
+
+    /**
+     * Returns 'foo' in 'customize_dynamic_setting_args'.
+     *
+     * @param array  $setting_args Setting args.
+     * @param string $setting_id   Setting ID.
+     * @return array Setting args.
+     */
+    public function return_dynamic_customize_setting_args( $setting_args, $setting_id ) {
+        if ( 0 === strpos( $setting_id, 'dynamic' ) ) {
+            $setting_args['custom'] = 'foo';
         }
-        return $args;
+        return $setting_args;
     }