Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-includes/query.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 `$var` and `$default` parameters to `$query_var` and `$default_value` in `get_query_var()`.
* Renames the `$var` parameter to `$query_var` in `set_query_var()`.

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], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961].

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


git-svn-id: http://core.svn.wordpress.org/trunk@54514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-12-13 12:26:15 +00:00
parent 4ffd8b005e
commit 58cde838c1
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1779,7 +1779,8 @@ class WP_Query {
* @since 3.9.0 The `$default_value` argument was introduced.
*
* @param string $query_var Query variable key.
* @param mixed $default_value 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.
*/
public function get( $query_var, $default_value = '' ) {

19
wp-includes/query.php
View File

@ -15,17 +15,18 @@
* Retrieves the value of a query variable in the WP_Query class.
*
* @since 1.5.0
* @since 3.9.0 The `$default` argument was introduced.
* @since 3.9.0 The `$default_value` argument was introduced.
*
* @global WP_Query $wp_query WordPress Query object.
*
* @param string $var The variable key to retrieve.
* @param mixed $default Optional. Value to return if the query variable is not set. Default empty.
* @param string $query_var The variable key to retrieve.
* @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.
*/
function get_query_var( $var, $default = '' ) {
function get_query_var( $query_var, $default_value = '' ) {
global $wp_query;
return $wp_query->get( $var, $default );
return $wp_query->get( $query_var, $default_value );
}
/**
@ -67,12 +68,12 @@ function get_queried_object_id() {
*
* @global WP_Query $wp_query WordPress Query object.
*
* @param string $var Query variable key.
* @param mixed $value Query variable value.
* @param string $query_var Query variable key.
* @param mixed $value Query variable value.
*/
function set_query_var( $var, $value ) {
function set_query_var( $query_var, $value ) {
global $wp_query;
$wp_query->set( $var, $value );
$wp_query->set( $query_var, $value );
}
/**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.2-alpha-54961';
$wp_version = '6.2-alpha-54962';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.