Changeset 53104 for trunk/tests/phpunit/tests/admin/includesPlugin.php

Timestamp:

04/08/2022 06:15:02 AM (3 years ago)

Author:

peterwilsoncc

Message:

Administration: Allow floats for menu positions.

Permit plugin authors to pass the menu position as a float in add_menu_page() and add_submenu_page(). This allows for a common practice within major plugins to avoid menu collisions by passing a float.

Follow up to [52569].

Props justinbusa, dd32, welcher, SergeyBiryukov, kirtan95, audrasjb, Cybr, chaion07, costdev, peterwilsoncc.
See #40927.

File:

• trunk/tests/phpunit/tests/admin/includesPlugin.php (modified) (5 diffs)

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -257 +257 @@
             array( -1, 0 ),                    // Negative numbers are treated the same as passing 0.
             array( -7, 0 ),                    // Negative numbers are treated the same as passing 0.
+            array( '-7', 0 ),                  // Negative numbers are treated the same as passing 0.
             array( 1, 1 ),                     // Insert as the second item.
+            array( '1', 1 ),                   // Insert as the second item.
+            array( 1.5, 1 ),                   // Insert as the second item.
+            array( '1.5', 1 ),                 // Insert as the second item.
             array( 3, 3 ),                     // Insert as the 4th item.
+            array( '3', 3 ),                   // Insert as the 4th item.
+            array( '3e0', 3 ),                 // Insert as the 4th item.
+            array( 3.5, 3 ),                   // Insert as the 4th item.
+            array( '3.5', 3 ),                 // Insert as the 4th item.
             array( $menu_count, $menu_count ), // Numbers equal to the number of items are added at the end.
             array( 123456, $menu_count ),      // Numbers higher than the number of items are added at the end.
@@ -315 +323 @@
         // Setup a menu with some items.
         add_menu_page( 'Main Menu', 'Main Menu', 'manage_options', 'main_slug', 'main_page_callback' );
-        add_submenu_page( 'main_slug', 'SubMenu 1', 'SubMenu 1', 'manage_options', 'submenu_page_1', 'submenu_callback_1', '2' );
+        add_submenu_page( 'main_slug', 'SubMenu 1', 'SubMenu 1', 'manage_options', 'submenu_page_1', 'submenu_callback_1', 'First' );
 
         // Clean up the temporary user.
@@ -330 +338 @@
      * @ticket 54798
      */
-    public function test_passing_string_as_position_fires_doing_it_wrong_menu() {
-        $this->setExpectedIncorrectUsage( 'add_menu_page' );
+    public function test_passing_float_as_position_does_not_override_int() {
         global $submenu, $menu;
 
@@ -343 +350 @@
 
         // Setup a menu with some items.
-        add_menu_page( 'Main Menu', 'Main Menu', 'manage_options', 'main_slug', 'main_page_callback', 'icon_url', '1' );
-        add_menu_page( 'Main Menu 1', 'Main Menu 1', 'manage_options', 'main1_slug', 'main1_page_callback', 'icon_url1', 1.5 );
+        add_menu_page( 'Main Menu 1', 'Main Menu 1', 'manage_options', 'main_slug_1', 'main_page_callback_1', 'icon_url_1', 1 );
+        add_menu_page( 'Main Menu 2', 'Main Menu 2', 'manage_options', 'main_slug_2', 'main_page_callback_2', 'icon_url_2', 2 );
+        add_menu_page( 'Main Menu 1.5', 'Main Menu 1.5', 'manage_options', 'main_slug_15', 'main_page_callback_15', 'icon_url_15', 1.5 );
 
         // Clean up the temporary user.
@@ -350 +358 @@
         wp_delete_user( $admin_user );
 
-        // Verify the menu was inserted.
-        $this->assertSame( 'main_slug', $menu[1][2] );
+        // Verify the menus were inserted.
+        $this->assertSame( 'main_slug_1', $menu[1][2] );
+        $this->assertSame( 'main_slug_2', $menu[2][2] );
         // Verify the menu was inserted correctly on passing float as position.
-        $this->assertSame( 'main1_slug', $menu['1.5'][2] );
+        $this->assertSame( 'main_slug_15', $menu['1.5'][2] );
     }