Changeset 3106195

Timestamp:

06/23/2024 12:21:34 PM (6 weeks ago)

Author:

whiteshadow

Message:

Minor: Fix many small IDE notices and warnings

This should not have any effect on functionality.

File:

• admin-menu-editor/trunk/includes/menu-editor-core.php (modified) (20 diffs)

admin-menu-editor/trunk/includes/menu-editor-core.php

@@ -33 +33 @@
     private $old_wp_submenu;
 
-    private $title_lookups = array();   //A list of page titles indexed by $item['file']. Used to
-                                        //fix the titles of moved plugin pages.
     private $reverse_item_lookup = array(); //Contains the final (merged & filtered) list of admin menu items,
                                             //indexed by URL.
@@ -465 +463 @@
             } else {
                 //Yes, this method can actually run before WP updates the list of active plugins. That means functions
-                //like is_plugin_active_for_network() will return false. As as result, we can't determine whether
+                //like is_plugin_active_for_network() will return false. As a result, we can't determine whether
                 //the plugin has been network-activated yet, so lets skip setting up the default config until
                 //the next page load.
@@ -842 +840 @@
                 if ( ! $this->current_user_can($data[1]) ) {
                     unset($submenu[$parent][$index]);
+
                     $_wp_submenu_nopriv[$parent][$data[2]] = true;
                 } else {
@@ -1337 +1336 @@
 
         //Sanity check. If the wp_scripts implementation has changed significantly, don't touch it.
-        if ( !isset($wp_scripts->queue) || (!is_array($wp_scripts->queue) || ($wp_scripts->queue instanceof Traversable)) ) {
+        if ( !isset($wp_scripts->queue) || ) ) {
             return;
         }
@@ -1405 +1404 @@
       */
     function enqueue_styles(){
-        wp_enqueue_auto_versioned_style('jquery-qtip-syle', plugins_url('css/jquery.qtip.min.css', $this->plugin_file), array());
+        wp_enqueue_auto_versioned_style('jquery-qtip-syle', plugins_url('css/jquery.qtip.min.css', $this->plugin_file));
 
         wp_register_auto_versioned_style(
@@ -1691 +1690 @@
      * @param string $title The current page title.
      * @return string New admin title.
+
+
      */
     function hook_admin_title($admin_title, $title){
@@ -2058 +2059 @@
    * @uses WPMenuEditor::$custom_wp_submenu Stores the generated sub-menu here.
    *
-   * @uses WPMenuEditor::$title_lookups Generates a lookup list of page titles.
    * @uses WPMenuEditor::$reverse_item_lookup Generates a lookup list of url => menu item relationships.
    *
@@ -2068 +2068 @@
         $new_menu = array();
         $new_submenu = array();
-        $this->title_lookups = array();
         $this->custom_menu_is_deep = false;
 
@@ -2085 +2084 @@
             $topmenu = $this->prepare_for_output($topmenu, 'menu');
 
-            if ( empty($topmenu['separator']) ) {
-                $this->title_lookups[$topmenu['file']] = !empty($topmenu['page_title']) ? $topmenu['page_title'] : $topmenu['menu_title'];
-            }
-
             //Prepare the submenu of this menu
             $topmenu['items'] = $this->prepare_children_for_output($topmenu);
@@ -2132 +2127 @@
         foreach ($menu['items'] as $item) {
             $item = $this->prepare_for_output($item, 'submenu', $menu, ($is_deep === true));
-
-            //Make a note of the page's correct title so we can fix it later if necessary.
-            $this->title_lookups[$item['file']] = !empty($item['page_title']) ? $item['page_title'] : $item['menu_title'];
 
             if ( !empty($item['items']) ) {
@@ -2291 +2283 @@
     private function convert_to_wp_format($item) {
         //Build the menu structure that WP expects
-        $wp_item = array(
+         array(
             $item['menu_title'],
             $item['access_level'],
@@ -2300 +2292 @@
             isset($item['wp_icon_url']) ? $item['wp_icon_url'] : $item['icon_url'],
         );
-
-        return $wp_item;
     }
 
@@ -2784 +2774 @@
                         . $debugOutput
                     );
-
-                    return;
                     // phpcs:enable
                 }
@@ -3056 +3044 @@
     }
 
+
+
+
     private function display_editor_ui() {
         //Prepare a bunch of parameters for the editor.
@@ -3226 +3217 @@
     private function display_plugin_settings_ui() {
         //These variables are used by settings-page.php.
-        /** @noinspection PhpUnusedLocalVariableInspection */
         $settings = $this->options;
-        /** @noinspection PhpUnusedLocalVariableInspection */
         $settings_page_url = $this->get_settings_page_url();
-        /** @noinspection PhpUnusedLocalVariableInspection */
         $editor_page_url = admin_url($this->settings_link);
-        /** @noinspection PhpUnusedLocalVariableInspection */
         $db_option_name = $this->option_name;
 
@@ -4297 +4284 @@
             }
 
-            if ( isset($top_menu['items']) && !empty($top_menu['items']) ) {
+            if ( !empty($top_menu['items']) ) {
                 foreach($top_menu['items'] as $item) {
                     if ( $item['separator'] ) {
@@ -4386 +4373 @@
         }
 
-        $badSubmenuExists = isset($this->default_wp_submenu['woocommerce'][0])
-            && isset($this->default_wp_submenu['woocommerce'][0][2])
+        $badSubmenuExists = isset($this->default_wp_submenu['woocommerce'][0][2])
             && ($this->default_wp_submenu['woocommerce'][0][2] === 'woocommerce');
         $anotherSubmenuExists = isset($this->default_wp_submenu['woocommerce'][1]);
@@ -4786 +4772 @@
         foreach($post_types as $id => $post_type) {
             $title = $id;
-            if (isset($post_type->labels, $post_type->labels->name) && !empty($post_type->labels->name)) {
+            if () {
                 $title = $post_type->labels->name;
             }
@@ -4825 +4811 @@
         foreach($taxonomies as $id => $taxonomy) {
             $title = $id;
-            if (isset($taxonomy->labels, $taxonomy->labels->name) && !empty($taxonomy->labels->name)) {
+            if () {
                 $title = $taxonomy->labels->name;
             }
@@ -5328 +5314 @@
 
         if ( !empty($menu) ) {
-            if ( !is_array($menu) && ($menu instanceof \Traversable) ) {
+            if ( !is_array($menu) && ($menu instanceof Traversable) ) {
                 $menu = iterator_to_array($menu);
             }