<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54809] branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php: Menus: Apply `menu-item-has-children` class in sub-menus.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54809">54809</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54809","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-11 02:40:54 +0000 (Fri, 11 Nov 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Menus: Apply `menu-item-has-children` class in sub-menus.
Ensure the `menu-item-has-children` class is added to sub-menu items when `wp_nav_menu()` is called with the `depth` parameter specified to a non-zero value.
Follow up to <a href="https://core.trac.wordpress.org/changeset/54478">[54478]</a>.
Props davidvongries, fpodhorsky, hellofromTonya, innovext, larsmqller, LeonidasMilossis, mattkeys, mukesh27, nuvoPoint, ocean90, outrankjames, petitphp, SergeyBiryukov, sippis, webmandesign, peterwilsoncc.
Merges <a href="https://core.trac.wordpress.org/changeset/54801">[54801]</a> to the 6.1 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/56946">#56946</a>.
See <a href="https://core.trac.wordpress.org/ticket/28620">#28620</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61srcwpincludesnavmenutemplatephp">branches/6.1/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#branches61testsphpunittestsmenuwpnavmenuphp">branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches61">branches/6.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.1 2022-11-11 02:39:20 UTC (rev 54808)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.1 2022-11-11 02:40:54 UTC (rev 54809)
</ins><a id="branches61"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:54645-54646,54649,54652,54660,54662,54669,54674,54678,54686,54690,54693,54698,54706,54724,54729-54730,54733,54741,54745,54751,54766,54768-54771,54774,54777,54782,54785-54789,54797,54799,54802-54804
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:54645-54646,54649,54652,54660,54662,54669,54674,54678,54686,54690,54693,54698,54706,54724,54729-54730,54733,54741,54745,54751,54766,54768-54771,54774,54777,54782,54785-54789,54797,54799,54801-54804
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches61srcwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/nav-menu-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/nav-menu-template.php 2022-11-11 02:39:20 UTC (rev 54808)
+++ branches/6.1/src/wp-includes/nav-menu-template.php 2022-11-11 02:40:54 UTC (rev 54809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,14 +204,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $menu_item->menu_item_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items_with_children[ $menu_item->menu_item_parent ] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Calculate the depth of each menu item with children
- foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
- $menu_item_parent = $menu_items_tree[ $menu_item_key ];
- while ( $menu_item_parent ) {
- $menu_item_depth = $menu_item_depth + 1;
- $menu_item_parent = $menu_items_tree[ $menu_item_parent ];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Calculate the depth of each menu item with children.
+ foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
+ $menu_item_parent = $menu_items_tree[ $menu_item_key ];
+ while ( $menu_item_parent ) {
+ $menu_item_depth = $menu_item_depth + 1;
+ $menu_item_parent = $menu_items_tree[ $menu_item_parent ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches61testsphpunittestsmenuwpnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php 2022-11-11 02:39:20 UTC (rev 54808)
+++ branches/6.1/tests/phpunit/tests/menu/wp-nav-menu.php 2022-11-11 02:40:54 UTC (rev 54809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $lvl0_menu_item = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> static $lvl1_menu_item = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> static $lvl2_menu_item = 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $lvl3_menu_item = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function set_up_before_class() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up_before_class();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +54,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create lvl3 menu item.
+ self::$lvl3_menu_item = wp_update_nav_menu_item(
+ self::$menu_id,
+ 0,
+ array(
+ 'menu-item-title' => 'Lvl3 menu item',
+ 'menu-item-url' => '#',
+ 'menu-item-parent-id' => self::$lvl2_menu_item,
+ 'menu-item-status' => 'publish',
+ )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This filter is used to prevent reusing a menu item ID more that once.
</span><span class="cx" style="display: block; padding: 0 10px"> * It caused the tests to fail after the first one since the IDs are missing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,6 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * when displaying the menu without specifying a custom depth.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28620
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 56946
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_nav_menu_should_have_has_children_class_without_custom_depth() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,12 +126,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$lvl2_menu_item
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_html,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Level 2 should be present in the HTML output and have the `menu-item-has-children` class.'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertStringContainsString(
+ sprintf(
+ '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+ self::$lvl3_menu_item
+ ),
+ $menu_html,
+ 'Level 3 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,6 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * `menu-item-has-children` even if it's the case when displaying the full menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28620
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 56946
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_nav_menu_should_not_have_has_children_class_with_custom_depth() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_html = wp_nav_menu(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu' => self::$menu_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'depth' => 2,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'depth' => 3,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,20 +172,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$lvl1_menu_item
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_html,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Level 1 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Level 1 should be present in the HTML output and have the `menu-item-has-children` class.'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertStringContainsString(
+ sprintf(
+ '<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+ self::$lvl2_menu_item
+ ),
+ $menu_html,
+ 'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringNotContainsString(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<li id="menu-item-%d"',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$lvl2_menu_item
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$lvl3_menu_item
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_html,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Level 2 should not be present in the HTML output.'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Level 3 should not be present in the HTML output.'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>