From 180bab6f432c423d2d92b1d9f5275728d997ec12 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 26 Apr 2022 09:58:23 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-embed.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 `$match` parameter to `$matches` in `WP_Embed::autoembed_callback()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. git-svn-id: https://develop.svn.wordpress.org/trunk@53269 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-embed.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/class-wp-embed.php b/src/wp-includes/class-wp-embed.php index 61f1cc3517..677a5944c4 100644 --- a/src/wp-includes/class-wp-embed.php +++ b/src/wp-includes/class-wp-embed.php @@ -454,16 +454,16 @@ class WP_Embed { /** * Callback function for WP_Embed::autoembed(). * - * @param array $match A regex match array. + * @param array $matches A regex match array. * @return string The embed HTML on success, otherwise the original URL. */ - public function autoembed_callback( $match ) { + public function autoembed_callback( $matches ) { $oldval = $this->linkifunknown; $this->linkifunknown = false; - $return = $this->shortcode( array(), $match[2] ); + $return = $this->shortcode( array(), $matches[2] ); $this->linkifunknown = $oldval; - return $match[1] . $return . $match[3]; + return $matches[1] . $return . $matches[3]; } /**