<!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>[43899] branches/5.0: Nav Menus: Fix a PHP 7.3 error when switching themes.</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/43899">43899</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/43899","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-15 23:19:40 +0000 (Thu, 15 Nov 2018)</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'>Nav Menus: Fix a PHP 7.3 error when switching themes.
When switching themes, `wp_map_nav_menu_locations()` is used to ensure nav menus are placed in the relevant menu location. Occasionally, menus are registered to locations with numeric slugs, rather than strings. `wp_map_nav_menu_locations()` assumed it would be the latter, and ran `stripos()` on those numeric slugs. This behaviour is deprecated in PHP 7.3.
As this is the last known PHP 7.3 incompatibility, this commit also removes PHP 7.3 from Travis' `allowed_failures` list.
Props desrosj, jorbin.
See <a href="https://core.trac.wordpress.org/ticket/45018">#45018</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50travisyml">branches/5.0/.travis.yml</a></li>
<li><a href="#branches50srcwpincludesnavmenuphp">branches/5.0/src/wp-includes/nav-menu.php</a></li>
<li><a href="#branches50testsphpunittestsmenunavmenuphp">branches/5.0/tests/phpunit/tests/menu/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50travisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/.travis.yml 2018-11-15 14:36:39 UTC (rev 43898)
+++ branches/5.0/.travis.yml 2018-11-15 23:19:40 UTC (rev 43899)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - php: nightly
</span><span class="cx" style="display: block; padding: 0 10px"> allow_failures:
</span><span class="cx" style="display: block; padding: 0 10px"> - php: nightly
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: 7.3
</del><span class="cx" style="display: block; padding: 0 10px"> before_install:
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><span class="cx" style="display: block; padding: 0 10px"> if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
</span></span></pre></div>
<a id="branches50srcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/nav-menu.php 2018-11-15 14:36:39 UTC (rev 43898)
+++ branches/5.0/src/wp-includes/nav-menu.php 2018-11-15 23:19:40 UTC (rev 43899)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,8 +1139,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $registered_nav_menus as $new_location => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ...actually match!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $new_location ) && false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_numeric( $new_location ) && $new_location !== $slug ) {
+ continue;
</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"> // Then see if any of the old locations...
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1150,8 +1152,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $slug_group as $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ... have a match as well.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $location ) && false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_numeric( $location ) && $location !== $slug ) {
+ continue;
</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"> // Make sure this location wasn't mapped and removed previously.
</span></span></pre></div>
<a id="branches50testsphpunittestsmenunavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/tests/phpunit/tests/menu/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/tests/phpunit/tests/menu/nav-menu.php 2018-11-15 14:36:39 UTC (rev 43898)
+++ branches/5.0/tests/phpunit/tests/menu/nav-menu.php 2018-11-15 23:19:40 UTC (rev 43899)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,4 +200,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Technically possible old nav menu locations were registered numerically.
+ *
+ * @covers wp_map_nav_menu_locations()
+ */
+ public function test_numerical_old_locations() {
+ $this->register_nav_menu_locations( array( 'primary', 1 ) );
+
+ $old_nav_menu_locations = array(
+ 'primary' => 1,
+ 'tertiary' => 2,
+ 0 => 3,
+ );
+
+ $next_theme_nav_menu_locations = array();
+ $new_next_theme_nav_menu_locations = wp_map_nav_menu_locations( $next_theme_nav_menu_locations, $old_nav_menu_locations );
+
+ $expected_nav_menu_locations = array(
+ 'primary' => 1,
+ 0 => 3,
+ );
+
+ $this->assertEqualSets( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>