Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-11 02:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.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 `$parent` to `$parent_post` in `WP_REST_Revisions_Controller::get_parent()`.

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], [54965], [54969].

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


git-svn-id: http://core.svn.wordpress.org/trunk@54522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-12-14 13:52:14 +00:00
parent e623438f68
commit 1d9e308c67
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
View File

@ -134,25 +134,29 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
* *
* @since 4.7.2 * @since 4.7.2
* *
* @param int $parent Supplied ID. * @param int $parent_post Supplied ID.
* @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise. * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
*/ */
protected function get_parent( $parent ) { protected function get_parent( $parent_post ) {
$error = new WP_Error( $error = new WP_Error(
'rest_post_invalid_parent', 'rest_post_invalid_parent',
__( 'Invalid post parent ID.' ), __( 'Invalid post parent ID.' ),
array( 'status' => 404 ) array( 'status' => 404 )
); );
if ( (int) $parent <= 0 ) {
if ( (int) $parent_post <= 0 ) {
return $error; return $error;
} }
$parent = get_post( (int) $parent ); $parent_post = get_post( (int) $parent_post );
if ( empty( $parent ) || empty( $parent->ID ) || $this->parent_post_type !== $parent->post_type ) {
if ( empty( $parent_post ) || empty( $parent_post->ID )
|| $this->parent_post_type !== $parent_post->post_type
) {
return $error; return $error;
} }
return $parent; return $parent_post;
} }
/** /**

2
wp-includes/version.php
View File

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