From 53063c633306997e2502a7ea90c90b58236f7183 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 4 Jan 2023 14:16:57 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `phpunit/includes/utils.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 `$callable` parameter to `$callback` in `get_echo()`. * Renames the `$array` parameter to `$expected_data` in `gen_tests_array()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@55028 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/includes/utils.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/includes/utils.php b/tests/phpunit/includes/utils.php index 1b839878b5..30af6aa348 100644 --- a/tests/phpunit/includes/utils.php +++ b/tests/phpunit/includes/utils.php @@ -431,16 +431,17 @@ function dmp_filter( $a ) { return $a; } -function get_echo( $callable, $args = array() ) { +function get_echo( $callback, $args = array() ) { ob_start(); - call_user_func_array( $callable, $args ); + call_user_func_array( $callback, $args ); return ob_get_clean(); } // Recursively generate some quick assertEquals() tests based on an array. -function gen_tests_array( $name, $array ) { +function gen_tests_array( $name, $expected_data ) { $out = array(); - foreach ( $array as $k => $v ) { + + foreach ( $expected_data as $k => $v ) { if ( is_numeric( $k ) ) { $index = (string) $k; } else { @@ -455,6 +456,7 @@ function gen_tests_array( $name, $array ) { $out[] = gen_tests_array( "{$name}[{$index}]", $v ); } } + return implode( "\n", $out ) . "\n"; }