Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-embed.php.

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@53269


git-svn-id: http://core.svn.wordpress.org/trunk@52858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-26 10:00:09 +00:00
parent 1dabd8df68
commit bbf6ffb769
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-embed.php
View File

@ -454,16 +454,16 @@ class WP_Embed {
/** /**
* Callback function for WP_Embed::autoembed(). * 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. * @return string The embed HTML on success, otherwise the original URL.
*/ */
public function autoembed_callback( $match ) { public function autoembed_callback( $matches ) {
$oldval = $this->linkifunknown; $oldval = $this->linkifunknown;
$this->linkifunknown = false; $this->linkifunknown = false;
$return = $this->shortcode( array(), $match[2] ); $return = $this->shortcode( array(), $matches[2] );
$this->linkifunknown = $oldval; $this->linkifunknown = $oldval;
return $match[1] . $return . $match[3]; return $matches[1] . $return . $matches[3];
} }
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta2-53268'; $wp_version = '6.0-beta2-53269';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.