From f889a5c7ffc78320e9210a4fd0f00c4833e15707 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 6 Dec 2022 13:01:16 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/l10n.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 `$text` in `before_last_bar()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@54938 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/l10n.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/l10n.php b/src/wp-includes/l10n.php index d7642c7038..651c78e791 100644 --- a/src/wp-includes/l10n.php +++ b/src/wp-includes/l10n.php @@ -222,15 +222,15 @@ function translate( $text, $domain = 'default' ) { * * @since 2.8.0 * - * @param string $string A pipe-delimited string. - * @return string Either $string or everything before the last pipe. + * @param string $text A pipe-delimited string. + * @return string Either $text or everything before the last pipe. */ -function before_last_bar( $string ) { - $last_bar = strrpos( $string, '|' ); +function before_last_bar( $text ) { + $last_bar = strrpos( $text, '|' ); if ( false === $last_bar ) { - return $string; + return $text; } else { - return substr( $string, 0, $last_bar ); + return substr( $text, 0, $last_bar ); } }