From 89a210a91843765bd156dac8e4f0fd26294cc6a9 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 31 Mar 2022 15:21:04 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-admin/includes/class-wp-list-table.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 `$default` parameter to `$default_value` in `WP_List_Table::get_items_per_page()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. Built from https://develop.svn.wordpress.org/trunk@53039 git-svn-id: http://core.svn.wordpress.org/trunk@52628 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-list-table.php | 6 +++--- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 3a658b9ace..fe8624d452 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -824,13 +824,13 @@ class WP_List_Table { * @since 3.1.0 * * @param string $option - * @param int $default + * @param int $default_value * @return int */ - protected function get_items_per_page( $option, $default = 20 ) { + protected function get_items_per_page( $option, $default_value = 20 ) { $per_page = (int) get_user_option( $option ); if ( empty( $per_page ) || $per_page < 1 ) { - $per_page = $default; + $per_page = $default_value; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 67065c9f57..ba1607c751 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-53038'; +$wp_version = '6.0-alpha-53039'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.