WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-query.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 `$array` parameter to `$query_vars` in `WP_Query::fill_query_vars()`.
* Renames the `$default` parameter to `$default_value` in `WP_Query::get()`.

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].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53277


git-svn-id: http://core.svn.wordpress.org/trunk@52866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-26 13:32:11 +00:00
parent 901dae255d
commit cc6dcc2623
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/class-wp-query.php
View File

@ -536,10 +536,10 @@ class WP_Query {
* @since 2.1.0 * @since 2.1.0
* @since 4.5.0 Removed the `comments_popup` public query variable. * @since 4.5.0 Removed the `comments_popup` public query variable.
* *
* @param array $array Defined query variables. * @param array $query_vars Defined query variables.
* @return array Complete query variables with undefined ones filled in empty. * @return array Complete query variables with undefined ones filled in empty.
*/ */
public function fill_query_vars( $array ) { public function fill_query_vars( $query_vars ) {
$keys = array( $keys = array(
'error', 'error',
'm', 'm',
@ -580,8 +580,8 @@ class WP_Query {
); );
foreach ( $keys as $key ) { foreach ( $keys as $key ) {
if ( ! isset( $array[ $key ] ) ) { if ( ! isset( $query_vars[ $key ] ) ) {
$array[ $key ] = ''; $query_vars[ $key ] = '';
} }
} }
@ -604,11 +604,12 @@ class WP_Query {
); );
foreach ( $array_keys as $key ) { foreach ( $array_keys as $key ) {
if ( ! isset( $array[ $key ] ) ) { if ( ! isset( $query_vars[ $key ] ) ) {
$array[ $key ] = array(); $query_vars[ $key ] = array();
} }
} }
return $array;
return $query_vars;
} }
/** /**
@ -1747,18 +1748,18 @@ class WP_Query {
* Retrieves the value of a query variable. * Retrieves the value of a query variable.
* *
* @since 1.5.0 * @since 1.5.0
* @since 3.9.0 The `$default` argument was introduced. * @since 3.9.0 The `$default_value` argument was introduced.
* *
* @param string $query_var Query variable key. * @param string $query_var Query variable key.
* @param mixed $default Optional. Value to return if the query variable is not set. Default empty string. * @param mixed $default_value Optional. Value to return if the query variable is not set. Default empty string.
* @return mixed Contents of the query variable. * @return mixed Contents of the query variable.
*/ */
public function get( $query_var, $default = '' ) { public function get( $query_var, $default_value = '' ) {
if ( isset( $this->query_vars[ $query_var ] ) ) { if ( isset( $this->query_vars[ $query_var ] ) ) {
return $this->query_vars[ $query_var ]; return $this->query_vars[ $query_var ];
} }
return $default; return $default_value;
} }
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta2-53276'; $wp_version = '6.0-beta2-53277';
/** /**
* 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.