Changeset 44167

Timestamp:

12/14/2018 05:15:54 AM (6 years ago)

Author:

desrosj

Message:

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 behavior is deprecated in PHP 7.3.

As this is the last PHP 7.3 error in unit tests, this commit also removes PHP 7.3 from Travis' allowed_failures list.

Props pento, desrosj, jorbin.

Merges [43899] to trunk.

See #45018.

Location:

trunk

Files:

• . (modified) (1 prop)
• .travis.yml (modified) (2 diffs)
• src/wp-includes/nav-menu.php (modified) (2 diffs)
• tests/phpunit/tests/menu/nav-menu.php (modified) (1 diff)

trunk/.travis.yml

@@ -13 +13 @@
 matrix:
   include:
-  - php: 7.3
   - php: 7.2
     env: WP_TRAVISCI=travis:format
   - php: 7.1
     env: WP_TRAVISCI=travis:js
+  - php: 7.3
   - php: 7.2
   - php: 7.1
@@ -35 +35 @@
   allow_failures:
   - php: nightly
-  - php: 7.3
 before_install:
 - |

trunk/src/wp-includes/nav-menu.php

@@ -1187 +1187 @@
 
                 // ...actually match!
-                if ( false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
+                if ( is_string( $new_location ) && false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
+                    continue;
+                } elseif ( is_numeric( $new_location ) && $new_location !== $slug ) {
                     continue;
                 }
@@ -1198 +1200 @@
 
                         // ... have a match as well.
-                        if ( false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
+                        if ( is_string( $location ) && false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
+                            continue;
+                        } elseif ( is_numeric( $location ) && $location !== $slug ) {
                             continue;
                         }

trunk/tests/phpunit/tests/menu/nav-menu.php

@@ -201 +201 @@
         $this->assertEqualSets( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );
     }
+
+    /**
+     * 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 );
+    }
 }