Changeset 47557 for trunk/src/wp-admin/includes/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-admin/includes/template.php (modified) (20 diffs)

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