Changeset 47848

Timestamp:

05/23/2020 11:36:36 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison for count() calls.

See #49542.

Location:

trunk/src

Files:

• wp-admin/includes/bookmark.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/deprecated.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/menu.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-admin/network.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-admin/users.php (modified) (2 diffs)
• wp-includes/class-wp-user.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (3 diffs)

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

@@ -199 +199 @@
 
     // Make sure we set a valid category.
-    if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
+    if ( ! is_array( $link_category ) || 0 === count( $link_category ) ) {
         $link_category = array( get_option( 'default_link_category' ) );
     }
@@ -258 +258 @@
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
     // If $link_categories isn't already an array, make it one:
-    if ( ! is_array( $link_categories ) || 0 == count( $link_categories ) ) {
+    if ( ! is_array( $link_categories ) || 0 === count( $link_categories ) ) {
         $link_categories = array( get_option( 'default_link_category' ) );
     }

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -499 +499 @@
 
         // Locate which directory to copy to the new folder. This is based on the actual folder holding the files.
-        if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) {
+        if ( 1 === count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) {
             // Only one folder? Then we want its contents.
             $source = trailingslashit( $args['source'] ) . trailingslashit( $source_files[0] );

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

@@ -1340 +1340 @@
         while ( true ) {
             // Abort this foreach loop iteration if there's no plugins left of this type.
-            if ( 0 == count($items) )
+            if ( 0 === count($items) )
                 continue 2;
 

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

@@ -1628 +1628 @@
     }
 
-    if ( 0 == count( $archive_files ) ) {
+    if ( 0 === count( $archive_files ) ) {
         return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
     }

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

@@ -169 +169 @@
      * remove the submenu.
      */
-    if ( ! empty( $submenu[ $data[2] ] ) && 1 == count( $submenu[ $data[2] ] ) ) {
+    if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
         $subs      = $submenu[ $data[2] ];
         $first_sub = reset( $subs );

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

@@ -857 +857 @@
     <h1><?php esc_html_e( 'Users' ); ?></h1>
 
-    <?php if ( 1 == count( $users ) ) : ?>
+    <?php if ( 1 === count( $users ) ) : ?>
         <p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
     <?php else : ?>
@@ -975 +975 @@
     do_action( 'delete_user_form', $current_user, $allusers );
 
-    if ( 1 == count( $users ) ) :
+    if ( 1 === count( $users ) ) :
         ?>
         <p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>

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

@@ -424 +424 @@
 $locations_screen = ( isset( $_GET['action'] ) && 'locations' === $_GET['action'] ) ? true : false;
 
+$page_count = wp_count_posts( 'page' );
+
 /*
  * If we have one theme location, and zero menus, we take them right
  * into editing their first menu.
  */
-$page_count                  = wp_count_posts( 'page' );
-$one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
+if ( 1 === count( get_registered_nav_menus() ) && ! $add_new_screen
+    && empty( $nav_menus ) && ! empty( $page_count->publish )
+) {
+    $one_theme_location_no_menus = true;
+} else {
+    $one_theme_location_no_menus = false;
+}
 
 $nav_menus_l10n = array(
@@ -929 +936 @@
                                 <?php
                                 $hide_style = '';
-                                if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+                                if ( isset( $menu_items ) && 0 === count( $menu_items ) ) {
                                     $hide_style = 'style="display: none;"';
                                 }

trunk/src/wp-admin/network.php

@@ -100 +100 @@
         $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
         if ( is_wp_error( $result ) ) {
-            if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' === $result->get_error_code() ) {
+            if ( 1 === count( $result->get_error_codes() ) && 'no_wildcard_dns' === $result->get_error_code() ) {
                 network_step2( $result );
             } else {

trunk/src/wp-admin/themes.php

@@ -286 +286 @@
 /*
 // Certain error codes are less fatal than others. We can still display theme information in most cases.
-if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
+if ( ! $ct->errors() || ( 1 === count( $ct->errors()->get_error_codes() )
     && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?>
 */

trunk/src/wp-admin/update-core.php

@@ -47 +47 @@
     } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
         $updates = get_core_updates();
-        if ( $updates && 1 == count( $updates ) ) {
+        if ( $updates && 1 === count( $updates ) ) {
             // If the only available update is a partial builds, it doesn't need a language-specific version string.
             $version_string = $update->current;

trunk/src/wp-admin/users.php

@@ -279 +279 @@
         <?php endif; ?>
 
-        <?php if ( 1 == count( $all_userids ) ) : ?>
+        <?php if ( 1 === count( $all_userids ) ) : ?>
     <p><?php _e( 'You have specified this user for deletion:' ); ?></p>
         <?php else : ?>
@@ -416 +416 @@
 <h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-        <?php if ( 1 == count( $userids ) ) : ?>
+        <?php if ( 1 === count( $userids ) ) : ?>
     <p><?php _e( 'You have specified this user for removal:' ); ?></p>
         <?php else : ?>

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

@@ -591 +591 @@
      */
     public function set_role( $role ) {
-        if ( 1 == count( $this->roles ) && current( $this->roles ) == $role ) {
+        if ( 1 === count( $this->roles ) && current( $this->roles ) == $role ) {
             return;
         }

trunk/src/wp-includes/formatting.php

@@ -407 +407 @@
         $opening_tag = true;
         $name_offset = 1;
-    } elseif ( 0 == count( $stack ) ) {
+    } elseif ( 0 === count( $stack ) ) {
         // Stack is empty. Just stop.
         return;

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

@@ -1073 +1073 @@
     if ( ! isset( $custom[ $key ] ) ) {
         return false;
-    } elseif ( 1 == count( $custom[ $key ] ) ) {
+    } elseif ( 1 === count( $custom[ $key ] ) ) {
         return $custom[ $key ][0];
     } else {

trunk/src/wp-includes/post.php

@@ -3710 +3710 @@
 
     // Make sure we set a valid category.
-    if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
+    if ( empty( $post_category ) || 0 === count( $post_category ) || ! is_array( $post_category ) ) {
         // 'post' requires at least one category.
         if ( 'post' === $post_type && 'auto-draft' !== $post_status ) {
@@ -4685 +4685 @@
             $post_categories = array();
         }
-    } elseif ( 1 == count( $post_categories ) && '' === reset( $post_categories ) ) {
+    } elseif ( 1 === count( $post_categories ) && '' === reset( $post_categories ) ) {
         return true;
     }
@@ -5440 +5440 @@
     }
 
-    if ( 1 == count( $post_status ) ) {
+    if ( 1 === count( $post_status ) ) {
         $where_post_type = $wpdb->prepare( 'post_type = %s AND post_status = %s', $parsed_args['post_type'], reset( $post_status ) );
     } else {