Changeset 47557 for trunk/src/wp-admin/nav-menus.php

Timestamp:

04/09/2020 03:41:04 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search().

This addresses all the remaining WordPress.PHP.StrictInArray.MissingTrueStrict issues in core.

Includes minor code layout fixes for better readability.

Follow-up to [47550].

See #49542.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (8 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -105 +105 @@
                         )
                     ) {
-
-                        $parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+                        if ( in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true ) ) {
+                            $parent_db_id = (int) $menu_item_data['menu_item_parent'];
+                        } else {
+                            $parent_db_id = 0;
+                        }
 
                         $parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
@@ -132 +135 @@
                 } elseif (
                     ! empty( $menu_item_data['menu_item_parent'] ) &&
-                    in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
+                    in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true )
                 ) {
                     $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
@@ -169 +172 @@
                     if (
                         ! empty( $menu_item_data['menu_item_parent'] ) &&
-                        in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
+                        in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true ) &&
                         isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) &&
                         ( $menu_item_data['menu_item_parent'] == $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
                     ) {
-                        $parent_db_id  = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+                        if ( in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true ) ) {
+                            $parent_db_id = (int) $menu_item_data['menu_item_parent'];
+                        } else {
+                            $parent_db_id = 0;
+                        }
+
                         $parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
 
@@ -199 +207 @@
                             ) {
                                 $_possible_parent_id = (int) get_post_meta( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ], '_menu_item_menu_item_parent', true );
-                                if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) ) {
+                                if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ), true ) ) {
                                     $menu_item_data['menu_item_parent'] = $_possible_parent_id;
                                 } else {
@@ -226 +234 @@
                         empty( $menu_item_data['menu_order'] ) ||
                         empty( $menu_item_data['menu_item_parent'] ) ||
-                        ! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
+                        ! in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true ) ||
                         empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) ||
                         $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] != $menu_item_data['menu_item_parent']
@@ -801 +809 @@
                         echo esc_html( $_nav_menu->truncated_name );
 
-                        if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
+                        if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations, true ) ) {
                             $locations_assigned_to_this_menu = array();
-                            foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
+
+                            foreach ( array_keys( $menu_locations, $_nav_menu->term_id, true ) as $menu_location_key ) {
                                 if ( isset( $locations[ $menu_location_key ] ) ) {
                                     $locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
@@ -816 +825 @@
                              * @param int $locations Number of menu locations to list. Default 3.
                              */
-                            $assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
+                            $locations_listed_per_menu = absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) );
+
+                            $assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, $locations_listed_per_menu );
 
                             // Adds ellipses following the number of locations defined in $assigned_locations.
@@ -957 +968 @@
                                 if ( ! isset( $auto_add ) ) {
                                     $auto_add = get_option( 'nav_menu_options' );
+
                                     if ( ! isset( $auto_add['auto_add'] ) ) {
                                         $auto_add = false;
-                                    } elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) ) {
+                                    } elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'], true ) ) {
                                         $auto_add = true;
                                     } else {