Changeset 46678

Timestamp:

11/08/2019 01:17:35 PM (5 years ago)

Author:

johnbillion

Message:

Toolbar: Un-deprecate the WP_Admin_Bar::add_menu() method.

This is only a wrapper for the add_node() method, but it's in widespread use both in core until [46642] and in thousands of plugins and themes. Deprecating it would have made sense when #19647 was originally opened but that's no longer the case.

Props whyisjake

Fixes #19647

Location:

trunk

Files:

• src/wp-includes/class-wp-admin-bar.php (modified) (2 diffs)
• tests/phpunit/tests/adminbar.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-admin-bar.php

@@ -91 +91 @@
      */
     public function add_menu( $node ) {
-        _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::add_node()' );
         $this->add_node( $node );
     }
@@ -104 +103 @@
      */
     public function remove_menu( $id ) {
-        _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::remove_node()' );
         $this->remove_node( $id );
     }

trunk/tests/phpunit/tests/adminbar.php

@@ -347 +347 @@
 
     /**
-     * @ticket 19647
-     */
-    public function test_deprecated_menu_methods() {
-        $admin_bar = new WP_Admin_Bar();
-        $node_data = array( 'id' => 'test-node-19647' );
-
-        // Test add_menu() deprecation.
-        $this->setExpectedDeprecated( 'WP_Admin_Bar::add_menu' );
-        $admin_bar->add_menu( $node_data );
-        $node_test = $admin_bar->get_node( 'test-node-19647' );
-        $this->assertNotNull( $node_test );
-
-        // Test remove_menu() deprecation.
-        $this->setExpectedDeprecated( 'WP_Admin_Bar::remove_menu' );
-        $admin_bar->remove_menu( 'test-node-19647' );
-        $node_test = $admin_bar->get_node( 'test-node-19647' );
-        $this->assertNull( $node_test );
-    }
-
-    /**
      * @ticket 22247
      */