Changeset 47557 for trunk/src/wp-includes/nav-menu-template.php

Timestamp:

04/09/2020 03:41:04 PM (6 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-includes/nav-menu-template.php (modified) (4 diffs)

trunk/src/wp-includes/nav-menu-template.php

@@ -393 +393 @@
 
                 // If the menu item corresponds to a taxonomy term for the currently queried non-hierarchical post object.
-                if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {
+                if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type
+                        && in_array( (int) $menu_item->object_id, $possible_object_parents, true )
+                ) {
                         $active_parent_object_ids[] = (int) $menu_item->object_id;
                         $active_parent_item_ids[]   = (int) $menu_item->db_id;
@@ -405 +407 @@
                                 || ( 'post_type' == $menu_item->type && $wp_query->is_singular )
                                 || ( 'taxonomy' == $menu_item->type
-                                        && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
+                                        && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax )
+                                        && $queried_object->taxonomy == $menu_item->object )
                         )
                 ) {
@@ -526 +529 @@
                                         && ! empty( $queried_object->post_type )
                                         && is_post_type_hierarchical( $queried_object->post_type )
-                                        && in_array( $parent_item->object_id, $queried_object->ancestors )
+                                        && in_array( (int) $parent_item->object_id, $queried_object->ancestors, true )
                                         && $parent_item->object != $queried_object->ID
                                 ) ||
@@ -534 +537 @@
                                         'taxonomy' == $parent_item->type
                                         && isset( $possible_taxonomy_ancestors[ $parent_item->object ] )
-                                        && in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+                                        && in_array( (int) $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ], true )
                                         && (
                                                 ! isset( $queried_object->term_id ) ||