From 84c43d18634ce6f61c098d8e76559852adf8eb72 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 5 Feb 2020 07:25:05 +0000 Subject: [PATCH] Docs: Correct type for `$item` and $args` parameters in `Walker_Nav_Menu_Checklist` and `Walker_Nav_Menu_Edit` to match the parent `Walker_Nav_Menu` class. Follow-up to [38559], [45537]. See #24587, #48303. Built from https://develop.svn.wordpress.org/trunk@47189 git-svn-id: http://core.svn.wordpress.org/trunk@46989 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../class-walker-nav-menu-checklist.php | 28 +++++++++---------- .../includes/class-walker-nav-menu-edit.php | 28 +++++++++---------- wp-includes/version.php | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/wp-admin/includes/class-walker-nav-menu-checklist.php b/wp-admin/includes/class-walker-nav-menu-checklist.php index ea4b362bb3..f166a8803d 100644 --- a/wp-admin/includes/class-walker-nav-menu-checklist.php +++ b/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -30,11 +30,11 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { * * @since 3.0.0 * - * @param string $output Used to append additional content (passed by reference). - * @param int $depth Depth of page. Used for padding. - * @param array $args Not used. + * @param string $output Used to append additional content (passed by reference). + * @param int $depth Depth of page. Used for padding. + * @param stdClass $args Not used. */ - public function start_lvl( &$output, $depth = 0, $args = array() ) { + public function start_lvl( &$output, $depth = 0, $args = null ) { $indent = str_repeat( "\t", $depth ); $output .= "\n$indent"; } @@ -65,13 +65,13 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { * @global int $_nav_menu_placeholder * @global int|string $nav_menu_selected_id * - * @param string $output Used to append additional content (passed by reference). - * @param object $item Menu item data object. - * @param int $depth Depth of menu item. Used for padding. - * @param array $args Not used. - * @param int $id Not used. + * @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. */ - public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { + public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) { global $_nav_menu_placeholder, $nav_menu_selected_id; $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1; diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php index 3c984950b0..c7e690af97 100644 --- a/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/wp-admin/includes/class-walker-nav-menu-edit.php @@ -22,11 +22,11 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * * @since 3.0.0 * - * @param string $output Passed by reference. - * @param int $depth Depth of menu item. Used for padding. - * @param array $args Not used. + * @param string $output Passed by reference. + * @param int $depth Depth of menu item. Used for padding. + * @param stdClass $args Not used. */ - public function start_lvl( &$output, $depth = 0, $args = array() ) {} + public function start_lvl( &$output, $depth = 0, $args = null ) {} /** * Ends the list of after the elements are added. @@ -35,11 +35,11 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * * @since 3.0.0 * - * @param string $output Passed by reference. - * @param int $depth Depth of menu item. Used for padding. - * @param array $args Not used. + * @param string $output Passed by reference. + * @param int $depth Depth of menu item. Used for padding. + * @param stdClass $args Not used. */ - public function end_lvl( &$output, $depth = 0, $args = array() ) {} + public function end_lvl( &$output, $depth = 0, $args = null ) {} /** * Start the element output. @@ -49,13 +49,13 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * * @global int $_wp_nav_menu_max_depth * - * @param string $output Used to append additional content (passed by reference). - * @param object $item Menu item data object. - * @param int $depth Depth of menu item. Used for padding. - * @param array $args Not used. - * @param int $id Not used. + * @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. */ - public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { + public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) { global $_wp_nav_menu_max_depth; $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; diff --git a/wp-includes/version.php b/wp-includes/version.php index 8fe5ffc7e7..b4b320da0d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-47188'; +$wp_version = '5.4-alpha-47189'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.