diff -r be944660c56a -r 3d72ae0968f4 wp/wp-admin/includes/class-walker-nav-menu-checklist.php
--- a/wp/wp-admin/includes/class-walker-nav-menu-checklist.php Wed Sep 21 18:19:35 2022 +0200
+++ b/wp/wp-admin/includes/class-walker-nav-menu-checklist.php Tue Sep 27 16:37:53 2022 +0200
@@ -61,22 +61,27 @@
* @see Walker_Nav_Menu::start_el()
*
* @since 3.0.0
+ * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+ * to match parent class for PHP 8 named parameter support.
*
* @global int $_nav_menu_placeholder
* @global int|string $nav_menu_selected_id
*
- * @param string $output Used to append additional content (passed by reference).
- * @param WP_Post $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param stdClass $args Not used.
- * @param int $id Not used.
+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Post $data_object Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param stdClass $args Not used.
+ * @param int $current_object_id Optional. ID of the current menu item. Default 0.
*/
- public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
+ public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) {
global $_nav_menu_placeholder, $nav_menu_selected_id;
+ // Restores the more descriptive, specific name for use within this method.
+ $menu_item = $data_object;
+
$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
- $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' === $item->post_type ? $item->object_id : $_nav_menu_placeholder;
- $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+ $possible_object_id = isset( $menu_item->post_type ) && 'nav_menu_item' === $menu_item->post_type ? $menu_item->object_id : $_nav_menu_placeholder;
+ $possible_db_id = ( ! empty( $menu_item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $menu_item->ID : 0;
$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
@@ -84,39 +89,39 @@
$output .= '';
// Menu item hidden fields.
$output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
+ $output .= '';
}
}