Ticket #19647: 19647.5.diff

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

@@ -35 +35 @@
         /**
          */
         public function initialize() {
-                $this->user = new stdClass;
+                $this->user = new stdClass();
 
                 if ( is_user_logged_in() ) {
                         /* Populate settings we need for the menu based on the current user. */
@@ -90 +90 @@
          * @param array $node The attributes that define the node.
          */
         public function add_menu( $node ) {
-                _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::add_node()' );
                 $this->add_node( $node );
         }
 
@@ -103 +102 @@
          * @param string $id The menu slug to remove.
          */
         public function remove_menu( $id ) {
-                _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::remove_node()' );
                 $this->remove_node( $id );
         }
 

tests/phpunit/tests/adminbar.php

@@ -15 +15 @@
         protected static $user_ids = array();
 
         public static function setUpBeforeClass() {
-                require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
+                require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
 
                 parent::setUpBeforeClass();
         }
@@ -37 +37 @@
 
                 register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
 
-                $admin_bar = new WP_Admin_Bar;
+                $admin_bar = new WP_Admin_Bar();
 
                 wp_admin_bar_new_content_menu( $admin_bar );
 
@@ -54 +54 @@
         function test_merging_existing_meta_values() {
                 wp_set_current_user( self::$editor_id );
 
-                $admin_bar = new WP_Admin_Bar;
+                $admin_bar = new WP_Admin_Bar();
 
                 $admin_bar->add_node(
                         array(
@@ -346 +346 @@
         }
 
         /**
-         * @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
          */
         public function test_admin_bar_has_edit_link_for_existing_posts() {