Changeset 58994

Timestamp:

09/05/2024 02:57:46 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-admin/includes/upgrade.php.

Follow-up to [725], [1575], [1975], [2037], [2966], [3670], [4738], [11958], [12776], [14080], [14485], [32378].

Props faisalahammad, mujuonly, aristath, poena, afercia, SergeyBiryukov.
Fixes #58041, #61607.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (12 diffs)

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

@@ -461 +461 @@
                          * TODO: Get previous_blog_id.
                          */
-                        if ( ! is_super_admin( $user_id ) && 1 != $user_id ) {
+                        if ( ! is_super_admin( $user_id ) && 1 !== $user_id ) {
                                 $wpdb->delete(
                                         $wpdb->usermeta,
@@ -640 +640 @@
          * @since 2.1.0
          *
-         * @global int  $wp_current_db_version The old (current) database version.
-         * @global int  $wp_db_version         The new database version.
+         * @global int $wp_current_db_version The old (current) database version.
+         * @global int $wp_db_version         The new database version.
          */
         function wp_upgrade() {
                 global $wp_current_db_version, $wp_db_version;
 
-                $wp_current_db_version = __get_option( 'db_version' );
+                $wp_current_db_version = (int) __get_option( 'db_version' );
 
                 // We are up to date. Nothing to do.
-                if ( $wp_db_version == $wp_current_db_version ) {
+                if ( $wp_db_version === $wp_current_db_version ) {
                         return;
                 }
@@ -701 +701 @@
         global $wp_current_db_version, $wp_db_version;
 
-        $wp_current_db_version = __get_option( 'db_version' );
+        $wp_current_db_version = (int) __get_option( 'db_version' );
 
         // We are up to date. Nothing to do.
-        if ( $wp_db_version == $wp_current_db_version ) {
+        if ( $wp_db_version === $wp_current_db_version ) {
                 return;
         }
@@ -927 +927 @@
                         // Check to see if it's already been imported.
                         $cat = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category ) );
-                        if ( ! $cat && 0 != $post->post_category ) { // If there's no result.
+                        if ( ! $cat && 0 !== (int) $post->post_category ) { // If there's no result.
                                 $wpdb->insert(
                                         $wpdb->post2cat,
@@ -1100 +1100 @@
         $options = $wpdb->get_results( "SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name" );
         foreach ( $options as $option ) {
-                if ( 1 != $option->dupes ) { // Could this be done in the query?
+                if ( $option->dupes > 1 ) { // Could this be done in the query?
                         $limit    = $option->dupes - 1;
                         $dupe_ids = $wpdb->get_col( $wpdb->prepare( "SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit ) );
@@ -1450 +1450 @@
                 if ( ! empty( $links ) ) {
                         foreach ( $links as $link ) {
-                                if ( 0 == $link->link_category ) {
+                                if ( 0 === (int) $link->link_category ) {
                                         continue;
                                 }
@@ -1675 +1675 @@
                  * but now 2 is the minimum depth to avoid confusion.
                  */
-                if ( get_option( 'thread_comments_depth' ) == '1' ) {
+                if ( 1 === (int) get_option( 'thread_comments_depth' ) ) {
                         update_option( 'thread_comments_depth', 2 );
                         update_option( 'thread_comments', 0 );
@@ -2552 +2552 @@
                         $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
                         foreach ( $indexes as $index ) {
-                                if ( 'domain_path' === $index->Key_name && 'domain' === $index->Column_name && 140 != $index->Sub_part ) {
+                                if ( 'domain_path' === $index->Key_name && 'domain' === $index->Column_name && '140' !== $index->Sub_part ) {
                                         $upgrade = true;
                                         break;
@@ -3122 +3122 @@
 
                                 // Is actual field type different from the field type in query?
-                                if ( $tablefield->Type != $fieldtype ) {
+                                if ( $tablefield->Type !== $fieldtype ) {
                                         $do_change = true;
                                         if ( in_array( $fieldtype_lowercased, $text_fields, true ) && in_array( $tablefield_type_lowercased, $text_fields, true ) ) {
@@ -3162 +3162 @@
                                 if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
                                         $default_value = $matches[1];
-                                        if ( $tablefield->Default != $default_value ) {
+                                        if ( $tablefield->Default !== $default_value ) {
                                                 // Add a query to change the column's default value
                                                 $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";
@@ -3201 +3201 @@
                                         'subpart'   => $tableindex->Sub_part,
                                 );
-                                $index_ary[ $keyname ]['unique']     = ( 0 == $tableindex->Non_unique ) ? true : false;
+                                $index_ary[ $keyname ]['unique']     = ( '0' === $tableindex->Non_unique ) ? true : false;
                                 $index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
                         }
@@ -3553 +3553 @@
         // Make the new site theme active.
         $current_template = __get_option( 'template' );
-        if ( WP_DEFAULT_THEME == $current_template ) {
+        if ( WP_DEFAULT_THEME === $current_template ) {
                 update_option( 'template', $template );
                 update_option( 'stylesheet', $template );