WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-09 07:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-admin/includes/taxonomy.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 `$parent` parameter to `$category_parent` in `category_exists()` and `wp_create_category()`. This matches the category object property of the same name.
* Amends similar parameters in `dropdown_categories()` and `wp_dropdown_cats()` for consistency.

Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215].

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


git-svn-id: http://core.svn.wordpress.org/trunk@52805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-19 13:51:08 +00:00
parent 90cbd98c6b
commit 05d12bfa4c
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/deprecated.php
View File

@ -78,10 +78,10 @@ function get_udims( $width, $height ) {
* @global int $post_ID * @global int $post_ID
* *
* @param int $default_category Unused. * @param int $default_category Unused.
* @param int $parent_category Unused. * @param int $category_parent Unused.
* @param array $popular_ids Unused. * @param array $popular_ids Unused.
*/ */
function dropdown_categories( $default_category = 0, $parent_category = 0, $popular_ids = array() ) { function dropdown_categories( $default_category = 0, $category_parent = 0, $popular_ids = array() ) {
_deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' ); _deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' );
global $post_ID; global $post_ID;
wp_category_checklist( $post_ID ); wp_category_checklist( $post_ID );
@ -127,21 +127,21 @@ function get_real_file_to_edit( $file ) {
* @deprecated 3.0.0 Use wp_dropdown_categories() * @deprecated 3.0.0 Use wp_dropdown_categories()
* @see wp_dropdown_categories() * @see wp_dropdown_categories()
* *
* @param int $current_cat Optional. ID of the current category. Default 0. * @param int $current_cat Optional. ID of the current category. Default 0.
* @param int $current_parent Optional. Current parent category ID. Default 0. * @param int $current_parent Optional. Current parent category ID. Default 0.
* @param int $parent_cat Optional. Parent ID to retrieve categories for. Default 0. * @param int $category_parent Optional. Parent ID to retrieve categories for. Default 0.
* @param int $level Optional. Number of levels deep to display. Default 0. * @param int $level Optional. Number of levels deep to display. Default 0.
* @param array $categories Optional. Categories to include in the control. Default 0. * @param array $categories Optional. Categories to include in the control. Default 0.
* @return void|false Void on success, false if no categories were found. * @return void|false Void on success, false if no categories were found.
*/ */
function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $parent_cat = 0, $level = 0, $categories = 0 ) { function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0 ) {
_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' ); _deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
if (!$categories ) if (!$categories )
$categories = get_categories( array('hide_empty' => 0) ); $categories = get_categories( array('hide_empty' => 0) );
if ( $categories ) { if ( $categories ) {
foreach ( $categories as $category ) { foreach ( $categories as $category ) {
if ( $current_cat != $category->term_id && $parent_cat == $category->parent) { if ( $current_cat != $category->term_id && $category_parent == $category->parent) {
$pad = str_repeat( '– ', $level ); $pad = str_repeat( '– ', $level );
$category->name = esc_html( $category->name ); $category->name = esc_html( $category->name );
echo "\n\t<option value='$category->term_id'"; echo "\n\t<option value='$category->term_id'";

18
wp-admin/includes/taxonomy.php
View File

@ -17,12 +17,12 @@
* *
* @see term_exists() * @see term_exists()
* *
* @param int|string $cat_name Category name. * @param int|string $cat_name Category name.
* @param int $parent Optional. ID of parent term. * @param int $category_parent Optional. ID of parent category.
* @return string|null Returns the category ID as a numeric string if the pairing exists, null if not. * @return string|null Returns the category ID as a numeric string if the pairing exists, null if not.
*/ */
function category_exists( $cat_name, $parent = null ) { function category_exists( $cat_name, $category_parent = null ) {
$id = term_exists( $cat_name, 'category', $parent ); $id = term_exists( $cat_name, 'category', $category_parent );
if ( is_array( $id ) ) { if ( is_array( $id ) ) {
$id = $id['term_id']; $id = $id['term_id'];
} }
@ -48,12 +48,12 @@ function get_category_to_edit( $id ) {
* *
* @since 2.0.0 * @since 2.0.0
* *
* @param int|string $cat_name * @param int|string $cat_name Category name.
* @param int $parent * @param int $category_parent Optional. ID of parent category.
* @return int|WP_Error * @return int|WP_Error
*/ */
function wp_create_category( $cat_name, $parent = 0 ) { function wp_create_category( $cat_name, $category_parent = 0 ) {
$id = category_exists( $cat_name, $parent ); $id = category_exists( $cat_name, $category_parent );
if ( $id ) { if ( $id ) {
return $id; return $id;
} }
@ -61,7 +61,7 @@ function wp_create_category( $cat_name, $parent = 0 ) {
return wp_insert_category( return wp_insert_category(
array( array(
'cat_name' => $cat_name, 'cat_name' => $cat_name,
'category_parent' => $parent, 'category_parent' => $category_parent,
) )
); );
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta1-53215'; $wp_version = '6.0-beta1-53216';
/** /**
* 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.