From 88b6ade46a643ba9eb7670aefdf93733f5dd693a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 21 Apr 2022 11:24:17 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/atomlib.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 `$content` in `AtomParser::xml_escape()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. Built from https://develop.svn.wordpress.org/trunk@53239 git-svn-id: http://core.svn.wordpress.org/trunk@52828 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/atomlib.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php index 97f85baf2d..90f6282243 100644 --- a/wp-includes/atomlib.php +++ b/wp-includes/atomlib.php @@ -388,10 +388,10 @@ class AtomParser { return false; } - function xml_escape($string) + function xml_escape($content) { return str_replace(array('&','"',"'",'<','>'), array('&','"',''','<','>'), - $string ); + $content ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 78a34241f5..9156593862 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta2-53238'; +$wp_version = '6.0-beta2-53239'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.