Changeset 47557

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-walker-category-checklist.php (modified) (3 diffs)
• wp-admin/includes/class-wp-filesystem-base.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-terms-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/includes/nav-menu.php (modified) (3 diffs)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/includes/revision.php (modified) (1 diff)
• wp-admin/includes/screen.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (20 diffs)
• wp-admin/nav-menus.php (modified) (8 diffs)
• wp-admin/network/site-info.php (modified) (2 diffs)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/class-http.php (modified) (1 diff)
• wp-includes/class-walker-page.php (modified) (1 diff)
• wp-includes/class-wp-http-cookie.php (modified) (1 diff)
• wp-includes/class-wp-http-curl.php (modified) (2 diffs)
• wp-includes/class-wp-query.php (modified) (2 diffs)
• wp-includes/class-wp-theme.php (modified) (1 diff)
• wp-includes/customize/class-wp-customize-nav-menu-setting.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (4 diffs)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/nav-menu-template.php (modified) (4 diffs)
• wp-includes/post.php (modified) (14 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (11 diffs)

trunk/src/wp-admin/includes/class-walker-category-checklist.php

@@ -84 +84 @@
                 $args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
 
-                $class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+                $class = in_array( $category->term_id, $args['popular_cats'], true ) ? ' class="popular-category"' : '';
 
                 $args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
@@ -92 +92 @@
                         $inner_class  = 'category';
 
-                        if ( in_array( $category->term_id, $args['selected_cats'] ) ) {
+                        if ( in_array( $category->term_id, $args['selected_cats'], true ) ) {
                                 $inner_class .= ' selected';
                                 $aria_checked = 'true';
@@ -103 +103 @@
                                 esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</div>';
                 } else {
+                        $is_selected = in_array( $category->term_id, $args['selected_cats'], true );
+                        $is_disabled = ! empty( $args['disabled'] );
+
                         $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
                                 '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="' . $name . '[]" id="in-' . $taxonomy . '-' . $category->term_id . '"' .
-                                checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
-                                disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
+                                checked( $is_selected, true, false ) .
+                                disabled( $is_disabled, true, false ) . ' /> ' .
                                 /** This filter is documented in wp-includes/category-template.php */
                                 esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</label>';

trunk/src/wp-admin/includes/class-wp-filesystem-base.php

@@ -402 +402 @@
 
                 for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
-                        $key = array_search( $attarray[ $i ], $legal );
+                        $key = array_search( $attarray[ $i ], $legal, true );
                         if ( $key ) {
                                 $realmode .= $legal[ $key ];

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -506 +506 @@
                 }
 
-                if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
+                if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins, true ) ) {
                         $actions['delete'] = '<a href="' . esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
                 }

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -301 +301 @@
                                         $my_parents[] = $my_parent;
                                         $p            = $my_parent->parent;
-                                        if ( in_array( $p, $parent_ids ) ) { // Prevent parent loops.
+                                        if ( in_array( $p, $parent_ids, true ) ) { // Prevent parent loops.
                                                 break;
                                         }

trunk/src/wp-admin/includes/dashboard.php

@@ -520 +520 @@
                 $user_id = get_current_user_id();
                 // Don't create an option if this is a super admin who does not belong to this site.
-                if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) {
+                if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ), true ) ) {
                         update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID.
                 }

trunk/src/wp-admin/includes/ms.php

@@ -923 +923 @@
                                                 )
                                         );
+
                                         if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
                                                 $user_site      = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
@@ -928 +929 @@
                                                 $user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
                                                 $user_list      = '';
+
                                                 foreach ( $blog_users as $user ) {
-                                                        if ( ! in_array( $user->ID, $allusers ) ) {
+                                                        if ( ! in_array( (int) $user->ID, $allusers, true ) ) {
                                                                 $user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
                                                         }
                                                 }
+
                                                 if ( '' == $user_list ) {
                                                         $user_list = $admin_out;
                                                 }
+
                                                 $user_dropdown .= $user_list;
                                                 $user_dropdown .= "</select>\n";

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

@@ -1150 +1150 @@
                 )
         );
-        $messages            = array();
-        $menu_items          = array();
+
+        $messages   = array();
+        $menu_items = array();
+
         // Index menu items by DB ID.
         foreach ( $unsorted_menu_items as $_item ) {
@@ -1174 +1176 @@
 
         wp_defer_term_counting( true );
+
         // Loop through all the menu items' POST variables.
         if ( ! empty( $_POST['menu-item-db-id'] ) ) {
@@ -1210 +1213 @@
         $auto_add        = ! empty( $_POST['auto-add-pages'] );
         $nav_menu_option = (array) get_option( 'nav_menu_options' );
+
         if ( ! isset( $nav_menu_option['auto_add'] ) ) {
                 $nav_menu_option['auto_add'] = array();
         }
+
         if ( $auto_add ) {
-                if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+                if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'], true ) ) {
                         $nav_menu_option['auto_add'][] = $nav_menu_selected_id;
                 }
         } else {
-                $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] );
+                $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'], true );
                 if ( false !== $key ) {
                         unset( $nav_menu_option['auto_add'][ $key ] );
                 }
         }
+
         // Remove non-existent/deleted menus.
         $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

trunk/src/wp-admin/includes/plugin.php

@@ -2171 +2171 @@
                                 $whitelist_options[ $page ][] = $key;
                         } else {
-                                $pos = array_search( $key, $whitelist_options[ $page ] );
+                                $pos = array_search( $key, $whitelist_options[ $page ], true );
                                 if ( false === $pos ) {
                                         $whitelist_options[ $page ][] = $key;
@@ -2203 +2203 @@
                 foreach ( $keys as $key ) {
                         if ( isset( $whitelist_options[ $page ] ) && is_array( $whitelist_options[ $page ] ) ) {
-                                $pos = array_search( $key, $whitelist_options[ $page ] );
+                                $pos = array_search( $key, $whitelist_options[ $page ], true );
                                 if ( false !== $pos ) {
                                         unset( $whitelist_options[ $page ][ $pos ] );

trunk/src/wp-admin/includes/post.php

@@ -549 +549 @@
 
                         foreach ( $pages as $page ) {
-                                if ( $page->ID == $parent ) {
-                                        $parent = $page->post_parent;
+                                if ( (int) $page->ID === $parent ) {
+                                        $parent = (int) $page->post_parent;
                                         break;
                                 }
@@ -569 +569 @@
 
                 if ( ! isset( $post_type_object )
-                        || ( isset( $children ) && in_array( $post_ID, $children ) )
+                        || ( isset( $children ) && in_array( $post_ID, $children, true ) )
                         || ! current_user_can( 'edit_post', $post_ID )
                 ) {

trunk/src/wp-admin/includes/revision.php

@@ -315 +315 @@
         $compare_two_mode = is_numeric( $from );
         if ( ! $compare_two_mode ) {
-                $found = array_search( $selected_revision_id, array_keys( $revisions ) );
+                $found = array_search( $selected_revision_id, array_keys( $revisions ), true );
                 if ( $found ) {
                         $from = array_keys( array_slice( $revisions, $found - 1, 1, true ) );

trunk/src/wp-admin/includes/screen.php

@@ -129 +129 @@
                                 }
 
+                                $is_hidden = in_array( $box['id'], $hidden, true );
+
                                 printf(
                                         '<label for="%1$s-hide"><input class="hide-postbox-tog" name="%1$s-hide" type="checkbox" id="%1$s-hide" value="%1$s" %2$s />%3$s</label>',
                                         esc_attr( $box['id'] ),
-                                        checked( in_array( $box['id'], $hidden, true ), false, false ),
+                                        checked( $is_hidden, false, false ),
                                         $widget_title
                                 );

trunk/src/wp-admin/includes/template.php

@@ -172 +172 @@
 
                 foreach ( $keys as $k ) {
-                        if ( in_array( $categories[ $k ]->term_id, $args['selected_cats'] ) ) {
+                        if ( in_array( $categories[ $k ]->term_id, $args['selected_cats'], true ) ) {
                                 $checked_categories[] = $categories[ $k ];
                                 unset( $categories[ $k ] );
@@ -229 +229 @@
 
         $popular_ids = array();
+
         foreach ( (array) $terms as $term ) {
                 $popular_ids[] = $term->term_id;
@@ -235 +236 @@
                 }
                 $id      = "popular-$taxonomy-$term->term_id";
-                $checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
+                $checked = in_array( $term->term_id, $checked_terms, true ) ? 'checked="checked"' : '';
                 ?>
 
@@ -292 +293 @@
                 /** This filter is documented in wp-includes/category-template.php */
                 $name    = esc_html( apply_filters( 'the_category', $category->name, '', '' ) );
-                $checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+                $checked = in_array( $cat_id, $checked_categories, true ) ? ' checked="checked"' : '';
                 echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, '</label></li>';
         }
@@ -340 +341 @@
 
         $taxonomy_names = get_object_taxonomies( $post->post_type );
+
         foreach ( $taxonomy_names as $taxonomy_name ) {
                 $taxonomy = get_taxonomy( $taxonomy_name );
@@ -722 +724 @@
 <option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
                 <?php
-
                 foreach ( $keys as $key ) {
                         if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
@@ -835 +836 @@
 
         echo "\n\n";
+
         $map = array(
                 'mm' => array( $mm, $cur_mm ),
@@ -842 +844 @@
                 'mn' => array( $mn, $cur_mn ),
         );
+
         foreach ( $map as $timeunit => $value ) {
                 list( $unit, $curr ) = $value;
@@ -869 +872 @@
 function page_template_dropdown( $default = '', $post_type = 'page' ) {
         $templates = get_page_templates( null, $post_type );
+
         ksort( $templates );
+
         foreach ( array_keys( $templates ) as $template ) {
                 $selected = selected( $default, $templates[ $template ], false );
@@ -1196 +1201 @@
                 $filename   = wp_normalize_path( $reflection->getFileName() );
                 $plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
+
                 if ( strpos( $filename, $plugin_dir ) === 0 ) {
                         $filename = str_replace( $plugin_dir, '', $filename );
@@ -1201 +1207 @@
 
                         $plugins = get_plugins();
+
                         foreach ( $plugins as $name => $plugin ) {
                                 if ( strpos( $name, $filename ) === 0 ) {
@@ -1250 +1257 @@
         // Pull them out of their previous context/priority and into the one the user chose.
         $sorted = get_user_option( "meta-box-order_$page" );
+
         if ( ! $already_sorted && $sorted ) {
                 foreach ( $sorted as $box_context => $ids ) {
@@ -1781 +1789 @@
         if ( $setting ) {
                 $setting_errors = array();
+
                 foreach ( (array) $wp_settings_errors as $key => $details ) {
                         if ( $setting == $details['setting'] ) {
@@ -1786 +1795 @@
                         }
                 }
+
                 return $setting_errors;
         }
@@ -1834 +1844 @@
 
         $output = '';
+
         foreach ( $settings_errors as $key => $details ) {
                 if ( 'updated' === $details['type'] ) {
@@ -1856 +1867 @@
                 $output .= "</div> \n";
         }
+
         echo $output;
 }
@@ -2085 +2097 @@
 
                 $post_states_string .= ' &mdash; ';
+
                 foreach ( $post_states as $state ) {
                         ++$i;
@@ -2189 +2202 @@
                         $header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
 
-                        if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images ) ) {
+                        if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images, true ) ) {
                                 $media_states[] = __( 'Header Image' );
                         }
@@ -2243 +2256 @@
                 $state_count = count( $media_states );
                 $i           = 0;
+
                 echo ' &mdash; ';
+
                 foreach ( $media_states as $state ) {
                         ++$i;
@@ -2370 +2385 @@
         $button_shorthand = array( 'primary', 'small', 'large' );
         $classes          = array( 'button' );
+
         foreach ( $type as $t ) {
                 if ( 'secondary' === $t || 'button-secondary' === $t ) {
                         continue;
                 }
+
                 $classes[] = in_array( $t, $button_shorthand, true ) ? 'button-' . $t : $t;
         }
+
         // Remove empty items, remove duplicate items, and finally build a string.
         $class = implode( ' ', array_unique( array_filter( $classes ) ) );

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 {

trunk/src/wp-admin/network/site-info.php

@@ -73 +73 @@
         $existing_details     = get_site( $id );
         $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
+
         foreach ( $blog_data_checkboxes as $c ) {
-                if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
+                if ( ! in_array( (int) $existing_details->$c, array( 0, 1 ), true ) ) {
                         $blog_data[ $c ] = $existing_details->$c;
                 } else {
@@ -195 +196 @@
                         <legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
                         <?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-                                <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+                                <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( (int) $details->$field_key, array( 0, 1 ), true ) ); ?> />
                                 <?php echo $field_label; ?></label><br/>
                         <?php endforeach; ?>

trunk/src/wp-admin/users.php

@@ -238 +238 @@
                 $all_userids = $userids;
 
-                if ( in_array( $current_user->ID, $userids ) ) {
+                if ( in_array( $current_user->ID, $userids, true ) ) {
                         $userids = array_diff( $userids, array( $current_user->ID ) );
                 }

trunk/src/wp-includes/class-http.php

@@ -1042 +1042 @@
                 // POST requests should not POST to a redirected location.
                 if ( 'POST' == $args['method'] ) {
-                        if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
+                        if ( in_array( $response['response']['code'], array( 302, 303 ), true ) ) {
                                 $args['method'] = 'GET';
                         }

trunk/src/wp-includes/class-walker-page.php

@@ -123 +123 @@
                 if ( ! empty( $current_page ) ) {
                         $_current_page = get_post( $current_page );
-                        if ( $_current_page && in_array( $page->ID, $_current_page->ancestors ) ) {
+
+                        if ( $_current_page && in_array( $page->ID, $_current_page->ancestors, true ) ) {
                                 $css_class[] = 'current_page_ancestor';
                         }
+
                         if ( $page->ID == $current_page ) {
                                 $css_class[] = 'current_page_item';
-                        } elseif ( $_current_page && $page->ID == $_current_page->post_parent ) {
+                        } elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
                                 $css_class[] = 'current_page_parent';
                         }

trunk/src/wp-includes/class-wp-http-cookie.php

@@ -193 +193 @@
 
                 // Port - supports "port-lists" in the format: "80,8000,8080".
-                if ( ! empty( $port ) && ! in_array( $url['port'], explode( ',', $port ) ) ) {
+                if ( ! empty( $port ) && ! in_array( $url['port'], array_map( 'intval', explode( ',', $port ) ), true ) ) {
                         return false;
                 }

trunk/src/wp-includes/class-wp-http-curl.php

@@ -239 +239 @@
                                 return new WP_Error( 'http_request_failed', $curl_error );
                         }
-                        if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
+                        if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
                                 curl_close( $handle );
                                 return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
@@ -287 +287 @@
                                 }
                         }
-                        if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
+                        if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
                                 curl_close( $handle );
                                 return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );

trunk/src/wp-includes/class-wp-query.php

@@ -3138 +3138 @@
                         // Loop over posts and relocate stickies to the front.
                         for ( $i = 0; $i < $num_posts; $i++ ) {
-                                if ( in_array( $this->posts[ $i ]->ID, $sticky_posts ) ) {
+                                if ( in_array( $this->posts[ $i ]->ID, $sticky_posts, true ) ) {
                                         $sticky_post = $this->posts[ $i ];
                                         // Remove sticky from current position.
@@ -3147 +3147 @@
                                         $sticky_offset++;
                                         // Remove post from sticky posts array.
-                                        $offset = array_search( $sticky_post->ID, $sticky_posts );
+                                        $offset = array_search( $sticky_post->ID, $sticky_posts, true );
                                         unset( $sticky_posts[ $offset ] );
                                 }

trunk/src/wp-includes/class-wp-theme.php

@@ -277 +277 @@
                         // Default themes always trump their pretenders.
                         // Properly identify default themes that are inside a directory within wp-content/themes.
-                        $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes );
+                        $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes, true );
                         if ( $default_theme_slug ) {
                                 if ( basename( $this->stylesheet ) != $default_theme_slug ) {

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php

@@ -180 +180 @@
 
                                         if ( isset( $nav_menu_options['auto_add'] ) && is_array( $nav_menu_options['auto_add'] ) ) {
-                                                $value['auto_add'] = in_array( $term->term_id, $nav_menu_options['auto_add'] );
+                                                $value['auto_add'] = in_array( $term->term_id, $nav_menu_options['auto_add'], true );
                                         }
                                 }
@@ -189 +189 @@
                         }
                 }
+
                 return $value;
         }
@@ -603 +604 @@
                 }
 
-                $i = array_search( $menu_id, $nav_menu_options['auto_add'] );
+                $i = array_search( $menu_id, $nav_menu_options['auto_add'], true );
+
                 if ( $auto_add && false === $i ) {
                         array_push( $nav_menu_options['auto_add'], $this->term_id );

trunk/src/wp-includes/general-template.php

@@ -2181 +2181 @@
                 ARRAY_N
         );
+
         if ( $dayswithposts ) {
                 foreach ( (array) $dayswithposts as $daywith ) {
-                        $daywithpost[] = $daywith[0];
+                        $daywithpost[] = (int) $daywith[0];
                 }
         }
@@ -2210 +2211 @@
                 }
 
-                if ( in_array( $day, $daywithpost ) ) {
+                if ( in_array( $day, $daywithpost, true ) ) {
                         // Any posts today?
                         $date_format = gmdate( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
@@ -2224 +2225 @@
                         $calendar_output .= $day;
                 }
+
                 $calendar_output .= '</td>';
 
@@ -2235 +2237 @@
                 $calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';
         }
+
         $calendar_output .= "\n\t</tr>\n\t</tbody>";
 

trunk/src/wp-includes/link-template.php

@@ -3688 +3688 @@
 
         $blogs = get_blogs_of_user( $user_id );
+
         if ( is_multisite() && ! user_can( $user_id, 'manage_network' ) && empty( $blogs ) ) {
                 $url = user_admin_url( $path, $scheme );
@@ -3694 +3695 @@
         } else {
                 $current_blog = get_current_blog_id();
-                if ( $current_blog && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
+
+                if ( $current_blog && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ), true ) ) ) {
                         $url = admin_url( $path, $scheme );
                 } else {

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 ) ||

trunk/src/wp-includes/post.php

@@ -2285 +2285 @@
         $stickies = get_option( 'sticky_posts' );
 
-        $is_sticky = is_array( $stickies ) && in_array( $post_id, $stickies );
+        if ( is_array( $stickies ) ) {
+                $stickies  = array_map( 'intval', $stickies );
+                $is_sticky = in_array( $post_id, $stickies, true );
+        } else {
+                $is_sticky = false;
+        }
 
         /**
@@ -2512 +2517 @@
  */
 function stick_post( $post_id ) {
+        $post_id  = (int) $post_id;
         $stickies = get_option( 'sticky_posts' );
 
         if ( ! is_array( $stickies ) ) {
-                $stickies = array( $post_id );
-        }
-
-        if ( ! in_array( $post_id, $stickies ) ) {
+                $stickies = array();
+        }
+
+        $stickies = array_map( 'intval', $stickies );
+
+        if ( ! in_array( $post_id, $stickies, true ) ) {
                 $stickies[] = $post_id;
         }
@@ -2546 +2554 @@
  */
 function unstick_post( $post_id ) {
+        $post_id  = (int) $post_id;
         $stickies = get_option( 'sticky_posts' );
 
@@ -2552 +2561 @@
         }
 
-        if ( ! in_array( $post_id, $stickies ) ) {
+        $stickies = array_map( 'intval', $stickies );
+
+        if ( ! in_array( $post_id, $stickies, true ) ) {
                 return;
         }
 
-        $offset = array_search( $post_id, $stickies );
+        $offset = array_search( $post_id, $stickies, true );
         if ( false === $offset ) {
                 return;
@@ -2842 +2853 @@
                 $mimes = array_map( 'trim', explode( ',', $type ) );
                 foreach ( $mimes as $mime ) {
-                        $regex                 = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+                        $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+
                         $patternses[][ $type ] = "^$regex$";
+
                         if ( false === strpos( $mime, '/' ) ) {
                                 $patternses[][ $type ] = "^$regex/";
@@ -2855 +2868 @@
                 foreach ( $patterns as $type => $pattern ) {
                         foreach ( (array) $real_mime_types as $real ) {
-                                if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[ $type ] ) || false === array_search( $real, $matches[ $type ] ) ) ) {
+                                if ( preg_match( "#$pattern#", $real )
+                                        && ( empty( $matches[ $type ] ) || false === array_search( $real, $matches[ $type ], true ) )
+                                ) {
                                         $matches[ $type ][] = $real;
                                 }
@@ -2861 +2876 @@
                 }
         }
+
         return $matches;
 }
@@ -2915 +2931 @@
                 }
         }
+
         if ( ! empty( $wheres ) ) {
                 $where = ' AND (' . join( ' OR ', $wheres ) . ') ';
         }
+
         return $where;
 }
@@ -4437 +4455 @@
                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
+                $post = get_post( $post_ID );
+
                 // Prevent new post slugs that could result in URLs that conflict with date archives.
-                $post                        = get_post( $post_ID );
                 $conflicts_with_date_archive = false;
                 if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) ) {
@@ -4445 +4464 @@
                         if ( $slug_num ) {
                                 $permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-                                $postname_index = array_search( '%postname%', $permastructs );
+                                $postname_index = array_search( '%postname%', $permastructs, true );
 
                                 /*
@@ -5501 +5520 @@
                 $num_pages = count( $pages );
                 for ( $i = 0; $i < $num_pages; $i++ ) {
-                        if ( in_array( $pages[ $i ]->ID, $exclude ) ) {
+                        if ( in_array( $pages[ $i ]->ID, $exclude, true ) ) {
                                 unset( $pages[ $i ] );
                         }
@@ -5812 +5831 @@
 function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
         $attachment_id = (int) $attachment_id;
-        $post          = get_post( $attachment_id );
+
+        $post = get_post( $attachment_id );
         if ( ! $post ) {
                 return false;
@@ -5846 +5866 @@
 function wp_update_attachment_metadata( $attachment_id, $data ) {
         $attachment_id = (int) $attachment_id;
-        $post          = get_post( $attachment_id );
+
+        $post = get_post( $attachment_id );
         if ( ! $post ) {
                 return false;
@@ -5879 +5900 @@
 function wp_get_attachment_url( $attachment_id = 0 ) {
         $attachment_id = (int) $attachment_id;
-        $post          = get_post( $attachment_id );
+
+        $post = get_post( $attachment_id );
         if ( ! $post ) {
                 return false;

trunk/src/wp-includes/rewrite.php

@@ -597 +597 @@
                         $query = array();
                         foreach ( (array) $query_vars as $key => $value ) {
-                                if ( in_array( $key, $wp->public_query_vars, true ) ) {
+                                if ( in_array( (string) $key, $wp->public_query_vars, true ) ) {
                                         $query[ $key ] = $value;
                                         if ( isset( $post_type_query_vars[ $key ] ) ) {

trunk/src/wp-includes/taxonomy.php

@@ -2469 +2469 @@
 
                 $term_info = term_exists( $term, $taxonomy );
+
                 if ( ! $term_info ) {
                         // Skip if a non-existent term ID is passed.
@@ -2474 +2475 @@
                                 continue;
                         }
+
                         $term_info = wp_insert_term( $term, $taxonomy );
                 }
+
                 if ( is_wp_error( $term_info ) ) {
                         return $term_info;
                 }
+
                 $term_ids[] = $term_info['term_id'];
                 $tt_id      = $term_info['term_taxonomy_id'];
@@ -2498 +2502 @@
                  */
                 do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
+
                 $wpdb->insert(
                         $wpdb->term_relationships,
@@ -2517 +2522 @@
                  */
                 do_action( 'added_term_relationship', $object_id, $tt_id, $taxonomy );
+
                 $new_tt_ids[] = $tt_id;
         }
@@ -2540 +2546 @@
 
         $t = get_taxonomy( $taxonomy );
+
         if ( ! $append && isset( $t->sort ) && $t->sort ) {
-                $values       = array();
-                $term_order   = 0;
+                $values     = array();
+                $term_order = 0;
+
                 $final_tt_ids = wp_get_object_terms(
                         $object_id,
@@ -2551 +2559 @@
                         )
                 );
+
                 foreach ( $tt_ids as $tt_id ) {
-                        if ( in_array( $tt_id, $final_tt_ids ) ) {
+                        if ( in_array( (int) $tt_id, $final_tt_ids, true ) ) {
                                 $values[] = $wpdb->prepare( '(%d, %d, %d)', $object_id, $tt_id, ++$term_order );
                         }
                 }
+
                 if ( $values ) {
                         if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . ' ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)' ) ) {
@@ -2579 +2589 @@
          */
         do_action( 'set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids );
+
         return $tt_ids;
 }
@@ -3617 +3628 @@
         $object_types = esc_sql( $tax_obj->object_type );
         $results      = $wpdb->get_results( "SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode( ',', array_keys( $term_ids ) ) . ") AND post_type IN ('" . implode( "', '", $object_types ) . "') AND post_status = 'publish'" );
+
         foreach ( $results as $row ) {
-                $id                                   = $term_ids[ $row->term_taxonomy_id ];
+                $id = $term_ids[ $row->term_taxonomy_id ];
+
                 $term_items[ $id ][ $row->object_id ] = isset( $term_items[ $id ][ $row->object_id ] ) ? ++$term_items[ $id ][ $row->object_id ] : 1;
         }
@@ -3628 +3641 @@
                 while ( ! empty( $terms_by_id[ $child ] ) && $parent = $terms_by_id[ $child ]->parent ) {
                         $ancestors[] = $child;
+
                         if ( ! empty( $term_items[ $term_id ] ) ) {
                                 foreach ( $term_items[ $term_id ] as $item_id => $touches ) {
@@ -3633 +3647 @@
                                 }
                         }
+
                         $child = $parent;
 
-                        if ( in_array( $parent, $ancestors ) ) {
+                        if ( in_array( $parent, $ancestors, true ) ) {
                                 break;
                         }
@@ -4523 +4538 @@
         if ( 'taxonomy' === $resource_type ) {
                 $term = get_term( $object_id, $object_type );
-                while ( ! is_wp_error( $term ) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+                while ( ! is_wp_error( $term ) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors, true ) ) {
                         $ancestors[] = (int) $term->parent;
                         $term        = get_term( $term->parent, $object_type );