From bcb3299a37712b61eb9b2a92c0b2fcc81e5d3d9d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 30 Mar 2022 10:43:08 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-admin/includes/class-wp-importer.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 `WP_Importer::min_whitespace()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. git-svn-id: https://develop.svn.wordpress.org/trunk@53029 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-importer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/class-wp-importer.php b/src/wp-admin/includes/class-wp-importer.php index aaed2e9d81..4c6d518f97 100644 --- a/src/wp-admin/includes/class-wp-importer.php +++ b/src/wp-admin/includes/class-wp-importer.php @@ -238,13 +238,13 @@ class WP_Importer { } /** - * Replace newlines, tabs, and multiple spaces with a single space + * Replace newlines, tabs, and multiple spaces with a single space. * - * @param string $string + * @param string $text * @return string */ - public function min_whitespace( $string ) { - return preg_replace( '|[\r\n\t ]+|', ' ', $string ); + public function min_whitespace( $text ) { + return preg_replace( '|[\r\n\t ]+|', ' ', $text ); } /**