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/rest-api/class-wp-rest-server.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 `$namespace` parameter to `$route_namespace` in:
* `WP_REST_Server::register_route()`
* `WP_REST_Server::get_routes()`

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], [54962], [54964].

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


git-svn-id: http://core.svn.wordpress.org/trunk@54517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-12-13 18:34:12 +00:00
parent e52cbfe467
commit 0230731505
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wp-includes/rest-api/class-wp-rest-server.php
View File

@ -797,26 +797,26 @@ class WP_REST_Server {
* *
* @since 4.4.0 * @since 4.4.0
* *
* @param string $namespace Namespace. * @param string $route_namespace Namespace.
* @param string $route The REST route. * @param string $route The REST route.
* @param array $route_args Route arguments. * @param array $route_args Route arguments.
* @param bool $override Optional. Whether the route should be overridden if it already exists. * @param bool $override Optional. Whether the route should be overridden if it already exists.
* Default false. * Default false.
*/ */
public function register_route( $namespace, $route, $route_args, $override = false ) { public function register_route( $route_namespace, $route, $route_args, $override = false ) {
if ( ! isset( $this->namespaces[ $namespace ] ) ) { if ( ! isset( $this->namespaces[ $route_namespace ] ) ) {
$this->namespaces[ $namespace ] = array(); $this->namespaces[ $route_namespace ] = array();
$this->register_route( $this->register_route(
$namespace, $route_namespace,
'/' . $namespace, '/' . $route_namespace,
array( array(
array( array(
'methods' => self::READABLE, 'methods' => self::READABLE,
'callback' => array( $this, 'get_namespace_index' ), 'callback' => array( $this, 'get_namespace_index' ),
'args' => array( 'args' => array(
'namespace' => array( 'namespace' => array(
'default' => $namespace, 'default' => $route_namespace,
), ),
'context' => array( 'context' => array(
'default' => 'view', 'default' => 'view',
@ -828,8 +828,9 @@ class WP_REST_Server {
} }
// Associative to avoid double-registration. // Associative to avoid double-registration.
$this->namespaces[ $namespace ][ $route ] = true; $this->namespaces[ $route_namespace ][ $route ] = true;
$route_args['namespace'] = $namespace;
$route_args['namespace'] = $route_namespace;
if ( $override || empty( $this->endpoints[ $route ] ) ) { if ( $override || empty( $this->endpoints[ $route ] ) ) {
$this->endpoints[ $route ] = $route_args; $this->endpoints[ $route ] = $route_args;
@ -854,17 +855,17 @@ class WP_REST_Server {
* used as the delimiter with preg_match() * used as the delimiter with preg_match()
* *
* @since 4.4.0 * @since 4.4.0
* @since 5.4.0 Add $namespace parameter. * @since 5.4.0 Added `$route_namespace` parameter.
* *
* @param string $namespace Optionally, only return routes in the given namespace. * @param string $route_namespace Optionally, only return routes in the given namespace.
* @return array `'/path/regex' => array( $callback, $bitmask )` or * @return array `'/path/regex' => array( $callback, $bitmask )` or
* `'/path/regex' => array( array( $callback, $bitmask ), ...)`. * `'/path/regex' => array( array( $callback, $bitmask ), ...)`.
*/ */
public function get_routes( $namespace = '' ) { public function get_routes( $route_namespace = '' ) {
$endpoints = $this->endpoints; $endpoints = $this->endpoints;
if ( $namespace ) { if ( $route_namespace ) {
$endpoints = wp_list_filter( $endpoints, array( 'namespace' => $namespace ) ); $endpoints = wp_list_filter( $endpoints, array( 'namespace' => $route_namespace ) );
} }
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.2-alpha-54964'; $wp_version = '6.2-alpha-54965';
/** /**
* 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.